Merge branch 'hotfix/r-544' into main

Adopta-Un-Abuelo · Oct 24, 2023 · 30e9b0e · 30e9b0e
2 parents d444e60 + 6b44ce0
commit 30e9b0e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/components/Avatar/Avatar.stories.tsx b/src/components/Avatar/Avatar.stories.tsx
@@ -26,7 +26,8 @@ export default {
 
 export const Default = {
 	args: {
-		name: 'Test'
+		name: 'Test',
+		style: {}
 	},
 	play: async ({canvasElement}: any) =>{
 		const canvas = within(canvasElement);

diff --git a/src/components/Avatar/Avatar.tsx b/src/components/Avatar/Avatar.tsx
@@ -99,7 +99,7 @@ const Avatar = (props: Props) =>{
             {props.icon ?
                 <Icon src={props.icon}/> 
             : props.name ? 
-                <Text style={{fontSize: props.style?.fontSize ? props.style.fontSize : 24, fontWeight: 600}}>
+                <Text style={{color: props.style?.color ? props.style?.color : Color.text.primary, fontSize: props.style?.fontSize ? props.style.fontSize : 24, fontWeight: 600}}>
                     {props.name.substring(0,1).toLocaleUpperCase()}
                 </Text>
             :null}

diff --git a/src/components/Counter/Counter.tsx b/src/components/Counter/Counter.tsx
@@ -12,7 +12,7 @@ function Counter(props: Props) {
 
     useEffect(() => {
         clearTimer();
-        setCounter(props.amount > 0 ? props.amount-10 : 0)
+        setCounter(props.amount > 0 ? props.amount-(props.amount >= 10 ? 10 : props.amount) : 0)
         countdownRef.current = window.setInterval(tick, 400);
         return () => clearTimer();
     }, [props.amount]);