Merge pull request #1267 from andrew-bierman/fix-item-visibility-crea…

…teTrip fix item visibilty in create trip
andrew-bierman · Sep 26, 2024 · 8d15fb6 · 8d15fb6
2 parents f526655 + 68e1834
commit 8d15fb6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/packages/app/modules/pack/components/PackTable/TableContainer.tsx b/packages/app/modules/pack/components/PackTable/TableContainer.tsx
@@ -135,14 +135,14 @@ export const TableContainer = ({
             weight={totalWeight}
             unit={weightUnit}
           />
+          <WeightUnitDropdown
+            value={weightUnit}
+            onChange={(itemValue: string) => setWeightUnit(itemValue as any)}
+          />
         </>
       ) : (
         <RText style={styles.noItemsText}>Add your First Item</RText>
       )}
-      <WeightUnitDropdown
-        value={weightUnit}
-        onChange={(itemValue: string) => setWeightUnit(itemValue as any)}
-      />
     </View>
   );
 };
diff --git a/packages/app/modules/pack/widgets/PackContainer.tsx b/packages/app/modules/pack/widgets/PackContainer.tsx
@@ -7,6 +7,7 @@ import { usePackId, useUserPacks, TableContainer } from 'app/modules/pack';
 import { DropdownComponent } from '@packrat/ui';
 import { Spinner } from 'tamagui';
 import useTheme from 'app/hooks/useTheme';
+import { TableContainerComponent } from 'app/screens/trip/TripDetailsComponents';
 
 export default function PackContainer({ isCreatingTrip = false }) {
   const [isAddItemModalOpen, setIsAddItemModalOpen] = useState(false);
@@ -74,19 +75,7 @@ export default function PackContainer({ isCreatingTrip = false }) {
             />
             {currentPackId && (
               <>
-                <AddItemModal
-                  currentPackId={currentPackId}
-                  currentPack={currentPack}
-                  isAddItemModalOpen={isAddItemModalOpen}
-                  setIsAddItemModalOpen={setIsAddItemModalOpen}
-                />
-                <TableContainer
-                  key={`table - ${currentPackId}`}
-                  currentPack={currentPack}
-                  selectedPack={currentPackId}
-                  refetch={refetch}
-                  setRefetch={setRefetch}
-                />
+                <TableContainerComponent currentPack={currentPack} />
               </>
             )}
           </>