From e44b3dc07c5ea3f89e559300ddff6f64881adfc2 Mon Sep 17 00:00:00 2001
From: Andrew Bierman <94939237+andrew-bierman@users.noreply.github.com>
Date: Sun, 31 Dec 2023 16:06:04 -0500
Subject: [PATCH] updating @packrat/ui button and text to use styled from
 tamagui, still need to configure our tamagui theme properly

---
 packages/ui/src/RButton/index.tsx | 16 +++++-----------
 packages/ui/src/RText/index.tsx   | 26 +++++++++++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/packages/ui/src/RButton/index.tsx b/packages/ui/src/RButton/index.tsx
index 883306875..93e226fde 100644
--- a/packages/ui/src/RButton/index.tsx
+++ b/packages/ui/src/RButton/index.tsx
@@ -1,14 +1,8 @@
-import { Button } from 'tamagui';
-import useTheme from '~/hooks/useTheme';
+import { Button, styled } from 'tamagui';
 
-const RButton = ({children, backgroundColor, ...props}) => {
-  const { currentTheme } = useTheme();
-  const bg = backgroundColor ? backgroundColor : currentTheme.colors.secondaryBlue;
-  return (
-    <Button backgroundColor={bg} color={"white"} {...props}>
-      {children}
-    </Button>
-  );
-};
+const RButton = styled(Button, {
+  backgroundColor: '#0C66A1', // temp fix, we need to set up proper tamagui theme
+  color: 'white',
+})
 
 export default RButton;
diff --git a/packages/ui/src/RText/index.tsx b/packages/ui/src/RText/index.tsx
index a1e406e50..1bc4a67d4 100644
--- a/packages/ui/src/RText/index.tsx
+++ b/packages/ui/src/RText/index.tsx
@@ -1,11 +1,19 @@
-import { Text } from 'tamagui';
+// import { Text } from 'tamagui';
 
-const PRText = ({ children, style, ...props }) => {
-  return (
-    <Text style={[style]} fontFamily="$body" {...props}>
-      {children}
-    </Text>
-  );
-};
+// const PRText = ({ children, style, ...props }) => {
+//   return (
+//     <Text style={[style]} fontFamily="$body" {...props}>
+//       {children}
+//     </Text>
+//   );
+// };
 
-export default PRText;
+// export default PRText;
+
+import { Paragraph, styled } from "tamagui";
+
+const RText = styled(Paragraph, {
+    fontFamily: "$body",
+    });
+
+export default RText;
\ No newline at end of file