@ssa-ui-kit/widgets 0.0.20-alpha → 0.0.22-alpha

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ssa-ui-kit/widgets",
-  "version": "0.0.20-alpha",
+  "version": "0.0.22-alpha",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "private": false,
@@ -29,9 +29,9 @@
     "js-tokens": "^4.0.0",
     "loose-envify": "^1.4.0",
     "scheduler": "^0.23.0",
-    "@ssa-ui-kit/core": "^0.0.18-alpha",
-    "@ssa-ui-kit/hooks": "^0.0.1-alpha",
-    "@ssa-ui-kit/utils": "^0.0.1-alpha"
+    "@ssa-ui-kit/core": "^0.0.22-alpha",
+    "@ssa-ui-kit/utils": "^0.0.1-alpha",
+    "@ssa-ui-kit/hooks": "^0.0.1-alpha"
   },
   "browserslist": [
     ">0.1%",

package/src/components/CollapsibleNavBar/NavBarPopover.tsx

@@ -67,7 +67,8 @@ export const CollapsibleNavBarPopover = ({
             display: 'block',
           },
           zIndex: 2,
-        }}>
+        }}
+        isFocusManagerDisabled={true}>
         <PopoverHeading
           css={{
             color: theme.colors.white,

package/src/components/TradingInfoCard/TradingInfoCard.stories.tsx

@@ -24,7 +24,7 @@ export const Default: StoryObj<typeof TradingInfoCard> = (
 };
 
 Default.args = {
-  value: '500',
+  value: 500.55,
   unit: 'USD',
   title: 'Turnover',
 };

package/src/components/TradingInfoCard/TradingInfoCard.tsx

@@ -5,34 +5,24 @@ import TradingInfoCardTooltip from './TradingInfoCardTooltip';
 import TradingInfoCardWrapper from './TradingInfoCardWrapper';
 import { ITradingInfoCardProps } from './types';
 
-const TradingInfoCard = ({
+const TradingInfoCardView = ({
   value,
   unit,
   title,
-  onClick,
   icon,
   link,
+  onClick,
 }: ITradingInfoCardProps) => {
   const number = Number(value);
-  const isInteger = Number.isInteger(number);
-  const currentValue = Number.isNaN(number) ? value : Math.floor(number);
+  const currentValue = Number.isNaN(number)
+    ? value
+    : number.toFixed(1).includes('.0')
+    ? Math.floor(number)
+    : number.toFixed(1);
 
   return (
     <TradingInfoCardWrapper onClick={onClick} link={link}>
-      {isInteger || Number.isNaN(number) ? (
-        <TradingInfoCardContent value={currentValue} unit={unit} icon={icon} />
-      ) : (
-        <TradingInfoCardTooltip
-          trigger={
-            <TradingInfoCardContent
-              value={currentValue}
-              unit={unit}
-              icon={icon}
-            />
-          }>
-          {value} {unit}
-        </TradingInfoCardTooltip>
-      )}
+      <TradingInfoCardContent value={currentValue} unit={unit} icon={icon} />
       <CardContent>
         <Typography css={{ fontSize: '12px' }}>{title}</Typography>
       </CardContent>
@@ -40,4 +30,20 @@ const TradingInfoCard = ({
   );
 };
 
+const TradingInfoCard = (props: ITradingInfoCardProps) => {
+  const { value, unit } = props;
+  const number = Number(value);
+  const isInteger = Number.isInteger(number);
+
+  if (isInteger || Number.isNaN(number)) {
+    return <TradingInfoCardView {...props} />;
+  } else {
+    return (
+      <TradingInfoCardTooltip trigger={<TradingInfoCardView {...props} />}>
+        {value} {unit}
+      </TradingInfoCardTooltip>
+    );
+  }
+};
+
 export default TradingInfoCard;

package/src/components/TradingScoreboard/helpers.tsx

@@ -68,7 +68,7 @@ export const oneLineBoardArr = [
     title: 'Orders',
   },
   {
-    value: '500.025',
+    value: '500.125',
     unit: 'USD',
     title: 'Turnover',
   },