fix: conflicts of build has been resolved (#1428)

fix conflicts
interledger · Jun 27, 2024 · c14b686 · c14b686
1 parent 2078190
commit c14b686
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 12 deletions.
diff --git a/packages/wallet/backend/src/walletAddress/model.ts b/packages/wallet/backend/src/walletAddress/model.ts
@@ -3,7 +3,7 @@ import { Account } from '@/account/model'
 import { Transaction } from '@/transaction/model'
 import { WalletAddressKeys } from '@/walletAddressKeys/model'
 import { BaseModel } from '@shared/backend'
-import { IWalletAddressResponse } from '@wallet/shared/src'
+import { IWalletAddressResponse } from '@wallet/shared'
 
 export class WalletAddress extends BaseModel implements IWalletAddressResponse {
   static tableName = 'walletAddresses'

diff --git a/packages/wallet/backend/src/walletAddressKeys/controller.ts b/packages/wallet/backend/src/walletAddressKeys/controller.ts
@@ -7,7 +7,7 @@ import {
   uploadWalletAddressKey
 } from './validation'
 import { Controller, toSuccessResponse } from '@shared/backend'
-import { WalletAddressKeyResponse } from '@wallet/shared/src/types/WalletAddressKey'
+import { WalletAddressKeyResponse } from '@wallet/shared'
 
 interface IWalletAddressKeyController {
   registerKey: Controller<KeyResponse>

diff --git a/packages/wallet/backend/src/walletAddressKeys/model.ts b/packages/wallet/backend/src/walletAddressKeys/model.ts
@@ -1,7 +1,7 @@
 import { Model } from 'objection'
 import { WalletAddress } from '@/walletAddress/model'
 import { BaseModel } from '@shared/backend'
-import { WalletAddressKeyResponse } from '@wallet/shared/src/types/WalletAddressKey'
+import { WalletAddressKeyResponse } from '@wallet/shared'
 
 export class WalletAddressKeys
   extends BaseModel

diff --git a/packages/wallet/frontend/src/components/cards/WalletAddressCard.tsx b/packages/wallet/frontend/src/components/cards/WalletAddressCard.tsx
@@ -14,7 +14,7 @@ import { PencilSquare } from '../icons/Pencil'
 import { Trash } from '../icons/Trash'
 import { EditWalletAddressDialog } from '../dialogs/EditWalletAddressDialog'
 import { CopyButton } from '@/ui/CopyButton'
-import { WalletAddressResponse } from '@wallet/shared/src'
+import { WalletAddressResponse } from '@wallet/shared'
 
 type WalletAddressCardProps = {
   walletAddress: WalletAddressResponse

diff --git a/packages/wallet/frontend/src/components/dialogs/EditWalletAddressDialog.tsx b/packages/wallet/frontend/src/components/dialogs/EditWalletAddressDialog.tsx
@@ -14,7 +14,7 @@ import { getObjectKeys } from '@/utils/helpers'
 import { OPEN_PAYMENTS_HOST } from '@/utils/constants'
 import { useDialog } from '@/lib/hooks/useDialog'
 import { SuccessDialog } from './SuccessDialog'
-import { WalletAddressResponse } from '@wallet/shared/src'
+import { WalletAddressResponse } from '@wallet/shared'
 
 type EditWalletAddressDialogProps = Pick<DialogProps, 'onClose'> & {
   walletAddress: WalletAddressResponse

diff --git a/packages/wallet/frontend/src/components/settings/DeveloperKeys.tsx b/packages/wallet/frontend/src/components/settings/DeveloperKeys.tsx
@@ -20,8 +20,8 @@ import { ConfirmationDialog } from '../dialogs/ConfirmationDialog'
 import { GenerateKeysDialog } from '../dialogs/GenerateKeysDialog'
 import { UploadPublicKeyDialog } from '../dialogs/UploadPublicKeyDialog'
 import { useOnboardingContext } from '@/lib/context/onboarding'
-import { WalletAddressResponse } from '@wallet/shared/src'
-import { WalletAddressKeyResponse } from '@wallet/shared/src/types/WalletAddressKey'
+import { WalletAddressResponse } from '@wallet/shared'
+import { WalletAddressKeyResponse } from '@wallet/shared'
 
 type WalletAddressContextType = {
   walletAddress: WalletAddressResponse

diff --git a/packages/wallet/frontend/src/lib/api/account.ts b/packages/wallet/frontend/src/lib/api/account.ts
@@ -12,7 +12,7 @@ import {
   withdrawFundsSchema,
   exchangeAssetSchema
 } from '@wallet/shared'
-import { WalletAddressResponse } from '@wallet/shared/src'
+import { WalletAddressResponse } from '@wallet/shared'
 
 export type Account = {
   id: string

diff --git a/packages/wallet/frontend/src/lib/api/walletAddress.ts b/packages/wallet/frontend/src/lib/api/walletAddress.ts
@@ -5,7 +5,7 @@ import {
   type ErrorResponse,
   type SuccessResponse
 } from '../httpClient'
-import { WalletAddressOP, WalletAddressResponse } from '@wallet/shared/src'
+import { WalletAddressOP, WalletAddressResponse } from '@wallet/shared'
 
 export const createWalletAddressSchema = z.object({
   walletAddressName: z.string().toLowerCase().min(3, {

diff --git a/packages/wallet/frontend/src/pages/account/[accountId].tsx b/packages/wallet/frontend/src/pages/account/[accountId].tsx
@@ -28,7 +28,7 @@ import { z } from 'zod'
 import { useSnapshot } from 'valtio'
 import { balanceState } from '@/lib/balance'
 import { PageHeader } from '@/components/PageHeader'
-import { WalletAddressResponse } from '@wallet/shared/src'
+import { WalletAddressResponse } from '@wallet/shared'
 
 type AccountPageProps = InferGetServerSidePropsType<typeof getServerSideProps>
 

diff --git a/packages/wallet/frontend/src/pages/account/create.tsx b/packages/wallet/frontend/src/pages/account/create.tsx
@@ -18,7 +18,7 @@ import { Controller } from 'react-hook-form'
 import { NextPageWithLayout } from '@/lib/types/app'
 import { useOnboardingContext } from '@/lib/context/onboarding'
 import { useEffect } from 'react'
-import { createAccountSchema } from '@wallet/shared/src'
+import { createAccountSchema } from '@wallet/shared'
 
 type CreateAccountProps = InferGetServerSidePropsType<typeof getServerSideProps>
 const CreateAccountPage: NextPageWithLayout<CreateAccountProps> = ({

diff --git a/packages/wallet/shared/src/types/index.ts b/packages/wallet/shared/src/types/index.ts
@@ -4,3 +4,4 @@ export * from './rate'
 export * from './transaction'
 export * from './grant'
 export * from './walletAddress'
+export * from './walletAddressKey'
diff --git a/packages/wallet/shared/src/types/walletAddress.ts b/packages/wallet/shared/src/types/walletAddress.ts
@@ -1,5 +1,5 @@
 import { AssetOP } from './asset'
-import { WalletAddressKeyResponse } from './WalletAddressKey'
+import { WalletAddressKeyResponse } from './walletAddressKey'
 
 export interface IWalletAddressResponse {
   id: string

diff --git a/...llet/shared/src/types/WalletAddressKey.ts → ...llet/shared/src/types/walletAddressKey.ts b/...llet/shared/src/types/WalletAddressKey.ts → ...llet/shared/src/types/walletAddressKey.ts