fix: resolve conflict

[honghoangsts]

Summary

Features

Bugs

Check List

• Your code builds clean without any errors or warnings.
• Check coding convention.
• Updated Storybook components and stories to reflect any changes made to the UI.
• Test covers all edge cases and coverage is greater than or equal to 80%.

Proof of Completeness

OR Video link

[github-actions]

Test Result

File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
All files	66.52	46.41	48.45	66.9

Details

File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
All files	66.52	46.41	48.45	66.9
_assets/images	100	100	100	100
_ check.png	100	100	100	100
_components	100	100	100	100
_ index.ts	100	100	100	100
_components/Accordion	94.73	62.74	100	94
_ Accordion.tsx	86.36	63.63	100	85.71	119-122
_ AccordionItem.tsx	100	63.88	100	100	23-26,115-135
_ ToggleAnimation.ts	100	50	100	100	8-9
_ index.ts	100	100	100	100
_components/Button	73.91	0	0	72.5
_ Button.tsx	69.23	0	0	72.72	86-87,114
_ ButtonOutline.tsx	71.42	100	0	66.66	7-8
_ ButtonPrimary.tsx	71.42	100	0	66.66	7-8
_ ButtonSecondary.tsx	71.42	100	0	66.66	7-8
_ ButtonTransparent.tsx	71.42	100	0	66.66	7-8
_ index.ts	100	100	100	100
_components/Card	100	100	100	100
_ Card.tsx	100	100	100	100
_ index.ts	100	100	100	100
_components/Checkbox	94.82	97.05	80	95.74
_ Checkbox.tsx	93.47	97.05	80	94.87	147,151
_ constants.ts	100	100	100	100
_ index.ts	100	100	100	100
_components/CodeInput	29.5	0	10	30.9
_ CodeInput.tsx	21.81	0	0	24	225-453
_ Cursor.tsx	100	100	100	100
_ index.ts	100	100	100	100
_components/CodeInput/components	68.18	0	0	73.33
_ ErrorText.tsx	71.42	100	0	80	11
_ HelperText.tsx	54.54	0	0	62.5	13-18
_ index.ts	100	100	0	100
_components/CountDown	92.79	95.61	95.83	92.59
_ CountDown.tsx	92.72	95.61	95.83	92.52	163-164,179,189-190,225,245-246
_ index.ts	100	100	100	100
_components/Icon	100	100	100	100
_ Icon.tsx	100	100	100	100
_ index.ts	100	100	100	100
_components/Progress	100	92.3	100	100
_ Progress.tsx	100	92.3	100	100	122-123
_ index.ts	100	100	100	100
_components/RadioButton	84.37	72.13	61.53	87.09
_ Bounceable.tsx	82.6	100	50	82.6	83-84,88-89
_ RadioButton.tsx	84.61	69.64	66.66	89.18	145,167-169
_ index.ts	100	100	100	100
_components/Slider	21.93	0	0	22.34
_ Slider.tsx	21.95	0	0	21.51	162-318
_ SliderFixed.tsx	18.75	0	0	18.64	50-184
_ SliderFixedRange.tsx	12	0	0	12.08	69-265
_ SliderRange.tsx	11.21	0	0	11.11	81-325
_ constants.ts	100	100	100	100
_ index.ts	100	100	100	100
_components/Slider/components	69.76	0	0	83.33
_ Thumb.tsx	70.58	0	0	92.3	37
_ Track.tsx	77.77	100	0	87.5	13
_ TrackPoint.tsx	57.14	100	0	66.66	26-41
_ index.ts	100	100	100	100
_components/Text	100	100	100	100
_ Text.tsx	100	100	100	100
_ index.ts	100	100	100	100
_components/TextInput	96.31	78.94	91.22	95.9
_ TextInput.tsx	96.87	96.42	90.9	96.29	110
_ TextInputFlat.tsx	95.65	62.06	91.3	95.16	89-90,94
_ TextInputOutlined.tsx	95.71	78.94	91.3	95.23	93-94,98
_ constants.ts	100	100	100	100
_ index.ts	100	100	100	100
_components/TextInput/components	100	100	100	100
_ CustomIcon.tsx	100	100	100	100
_ ErrorText.tsx	100	100	100	100
_ index.tsx	100	100	100	100
_components/Typography	100	72.72	100	100
_ Typography.tsx	100	72.72	100	100	8-73,77
_ index.ts	100	100	100	100
_core	63.63	25	36.36	58.62
_ BaseProvider.tsx	88.88	40	66.66	85.71	24,28
_ extendTheme.tsx	23.07	0	0	23.07	7,14-29
_ index.ts	100	100	100	100
_helpers	96.42	100	80	100
_ index.ts	100	100	100	100
_ metrics.ts	96.29	100	80	100
_hooks	70.58	0	50	66.66
_ index.ts	100	100	100	100
_ useBase.tsx	50	0	0	42.85	5-11
_ useTheme.tsx	85.71	0	100	83.33	7
_theme	100	100	100	100
_ images.ts	100	100	100	100
_ index.ts	100	100	100	100
_ theme.ts	100	100	100	100
_theme/base	100	100	100	100
_ borderWidths.ts	100	100	100	100
_ colors.ts	100	100	100	100
_ index.ts	100	100	100	100
_ opacity.ts	100	100	100	100
_ shadows.ts	100	100	100	100
_ sizes.ts	100	100	100	100
_ spacing.ts	100	100	100	100
_ typography.ts	100	100	100	100
_theme/components	100	100	100	100
_ Accordion.ts	100	100	100	100
_ Card.ts	100	100	100	100
_ Checkbox.ts	100	100	100	100
_ CodeInput.ts	100	100	100	100
_ CountDown.ts	100	100	100	100
_ Icon.ts	100	100	100	100
_ Progress.ts	100	100	100	100
_ RadioButton.ts	100	100	100	100
_ Slider.ts	100	100	100	100
_ Text.ts	100	100	100	100
_ TextInput.ts	100	100	100	100
_ Typography.ts	100	100	100	100
_ index.ts	100	100	100	100
_theme/components/Button	100	100	100	100
_ Button.ts	100	100	100	100
_ ButtonOutline.ts	100	100	100	100
_ ButtonPrimary.ts	100	100	100	100
_ ButtonSecondary.ts	100	100	100	100
_ ButtonTransparent.ts	100	100	100	100
_ index.ts	100	100	100	100