chore: merge latest components

OneKeyHQ · Oct 19, 2023 · 6be51d4 · 6be51d4
1 parent 78e1e8e
commit 6be51d4
Show file tree

Hide file tree

Showing 40 changed files with 540 additions and 548 deletions.
diff --git a/[2K[1Gundefined b/[2K[1Gundefined
diff --git a/packages/components/src/Alert/index.tsx b/packages/components/src/Alert/index.tsx
@@ -116,29 +116,28 @@ export const Alert: FC<AlertProps> = ({
         </Text>
         {action ? (
           <XStack pt="$2" space="$4" alignItems="center">
-            <Button
-              size="small"
-              buttonVariant="secondary"
-              onPress={action.onPrimaryPress}
-            >
-              <Button.Text>{action.primary}</Button.Text>
+            <Button size="small" onPress={action.onPrimaryPress}>
+              {action.primary}
             </Button>
             {action.secondary ? (
               <Button
                 size="small"
-                buttonVariant="tertiary"
+                variant="tertiary"
                 onPress={action.onSecondaryPress}
               >
-                <Button.Text> {action.secondary}</Button.Text>
+                {action.secondary}
               </Button>
             ) : null}
           </XStack>
         ) : null}
       </YStack>
       {closable ? (
-        <IconButton size="small" buttonVariant="tertiary" onPress={onClose}>
-          <IconButton.Icon name="CrossedSmallSolid" />
-        </IconButton>
+        <IconButton
+          icon="CrossedSmallSolid"
+          size="small"
+          variant="tertiary"
+          onPress={onClose}
+        />
       ) : null}
     </AlertFrame>
   );

diff --git a/packages/components/src/Button/Button.stories.tsx b/packages/components/src/Button/Button.stories.tsx