diff --git a/packages/app/components/card/PackCardHeader/PackCardHeader.tsx b/packages/app/components/card/PackCardHeader/PackCardHeader.tsx
index 2b1ed6f60..30fc9b42c 100644
--- a/packages/app/components/card/PackCardHeader/PackCardHeader.tsx
+++ b/packages/app/components/card/PackCardHeader/PackCardHeader.tsx
@@ -100,7 +100,7 @@ export const PackCardHeader = ({ data, title }: PackCardHeaderProps) => {
placeholder={
}
+ icon={}
style={{
height: 20,
}}
diff --git a/packages/app/modules/feed/screens/FeedScreen.tsx b/packages/app/modules/feed/screens/FeedScreen.tsx
index 794b8a7db..6be75be67 100644
--- a/packages/app/modules/feed/screens/FeedScreen.tsx
+++ b/packages/app/modules/feed/screens/FeedScreen.tsx
@@ -29,6 +29,7 @@ interface FeedProps {
const Feed = memo(function Feed({ feedType = 'public' }: FeedProps) {
const router = useRouter();
+ console.log({ feedType });
const [queryString, setQueryString] = useState('Favorite');
const [selectedTypes, setSelectedTypes] = useState({
pack: true,
diff --git a/packages/ui/src/Bento/elements/tables/Basic.tsx b/packages/ui/src/Bento/elements/tables/Basic.tsx
index d9d9f081f..55543a8d6 100644
--- a/packages/ui/src/Bento/elements/tables/Basic.tsx
+++ b/packages/ui/src/Bento/elements/tables/Basic.tsx
@@ -9,18 +9,17 @@ import * as React from 'react';
import { Text, View, getTokenValue } from 'tamagui';
import { Table } from './common/tableParts';
import { AddItem } from 'app/modules/item';
-import { DeletePackItemModal, EditPackItemModal } from 'app/modules/pack';
-import { ThreeDotsMenu, YStack, RButton, RText } from '@packrat/ui';
+import { MaterialIcons } from '@expo/vector-icons';
+import { EditPackItemModal } from 'app/modules/pack';
+import { RText } from '@packrat/ui';
-import { Platform } from 'react-native';
-import { RDropdownMenu } from '../../../ZDropdown';
import RIconButton from '../../../RIconButton';
-import { ChevronDown } from '@tamagui/lucide-icons';
import { BaseAlert } from '@packrat/ui';
import { useProfile } from 'app/modules/user/hooks';
import { useAuthUser } from 'app/modules/auth';
import { convertWeight } from 'app/utils/convertWeight';
import { SMALLEST_ITEM_UNIT } from 'app/modules/item/constants';
+import CascadedDropdownComponent from '@packrat/ui/src/CascadedDropdown';
type ModalName = 'edit' | 'delete';
@@ -43,6 +42,11 @@ interface GroupedData {
[key: string]: Item[];
}
+interface optionValues {
+ label: string;
+ value: string;
+}
+
interface BasicTableProps {
groupedData: GroupedData;
handleCheckboxChange: (itemId: string) => void;
@@ -82,13 +86,21 @@ export function BasicTable({
setSelectedItemId(null);
};
- const handleEditClick = () => {
- openModal('edit', item.id);
+ const handleActionsOpenChange = (state) => {
+ switch (state) {
+ case 'Edit':
+ openModal('edit', item.id);
+ break;
+ case 'Delete':
+ openModal('delete', item.id);
+ break;
+ }
};
- const handleDeleteClick = () => {
- openModal('delete', item.id);
- };
+ const optionValues: optionValues[] = [
+ { label: 'Edit', value: 'Edit' },
+ { label: 'Delete', value: 'Delete' },
+ ];
return (
<>
@@ -136,34 +148,28 @@ export function BasicTable({
{hasPermissions ? (
- Platform.OS === 'android' ||
- Platform.OS === 'ios' ||
- window.innerWidth < 900 ? (
-
-
- }
- />
-
- ) : (
-
-
-
- Edit
- Delete
-
-
-
- )
+
+ handleActionsOpenChange(value)}
+ placeholder={
+ }
+ style={{
+ height: 20,
+ }}
+ />
+ }
+ native={true}
+ />
+
) : null}
>
);
diff --git a/packages/ui/src/Details/Details.tsx b/packages/ui/src/Details/Details.tsx
index 34b772ce8..a21ca217f 100644
--- a/packages/ui/src/Details/Details.tsx
+++ b/packages/ui/src/Details/Details.tsx
@@ -33,7 +33,7 @@ export const Details: FC = ({ items }) => {
alignItems: 'center',
flexWrap: 'wrap',
textTransform: 'capitalize',
- color: primaryColor?.val,
+ // color: primaryColor?.val,
flex: 1,
fontSize: 14,
}}