fix conflicts

polarsource · Jan 23, 2025 · da07ac6 · da07ac6
1 parent c9f513f
commit da07ac6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/customers/ClientPage.tsx b/clients/apps/web/src/app/(main)/dashboard/[organization]/(header)/customers/ClientPage.tsx
@@ -16,6 +16,7 @@ import {
 import { AddOutlined, Search } from '@mui/icons-material'
 import { Customer, Organization } from '@polar-sh/api'
 import Avatar from '@polar-sh/ui/components/atoms/Avatar'
+import Button from '@polar-sh/ui/components/atoms/Button'
 import {
   DataTable,
   DataTableColumnDef,

diff --git a/clients/apps/web/src/components/Customer/CreateCustomerModal.tsx b/clients/apps/web/src/components/Customer/CreateCustomerModal.tsx
@@ -7,16 +7,16 @@ import {
   ResponseError,
   ValidationError,
 } from '@polar-sh/api'
-import Button from 'polarkit/components/ui/atoms/button'
-import Input from 'polarkit/components/ui/atoms/input'
+import Button from '@polar-sh/ui/components/atoms/Button'
+import Input from '@polar-sh/ui/components/atoms/Input'
 import {
   Form,
   FormControl,
   FormField,
   FormItem,
   FormLabel,
   FormMessage,
-} from 'polarkit/components/ui/form'
+} from '@polar-sh/ui/components/ui/form'
 import { useForm } from 'react-hook-form'
 import { toast } from '../Toast/use-toast'