From 5d1f45c79cc983c422d61c1f581654931061e7d6 Mon Sep 17 00:00:00 2001 From: bartosz-lipinski <264380+bartosz-lipinski@users.noreply.github.com> Date: Thu, 15 Apr 2021 23:52:56 -0500 Subject: [PATCH] fix: build error --- packages/bridge-sdk/package.json | 1 + packages/bridge/package.json | 1 + .../bridge/src/components/Input/input.tsx | 7 +- packages/common/package.json | 1 + packages/common/src/components/index.tsx | 1 - packages/lending/package.json | 1 + packages/metavinci/package.json | 1 + .../src/views/auctionCreate/index.tsx | 84 +---------- packages/proposals/package.json | 1 + packages/wallet-base/package.json | 48 ------- packages/wallet-base/src/index.ts | 17 --- packages/wallet-base/tsconfig.json | 23 --- packages/wallet-ledger/package.json | 45 ------ packages/wallet-ledger/src/core.ts | 133 ------------------ packages/wallet-ledger/src/index.ts | 88 ------------ packages/wallet-ledger/tsconfig.json | 23 --- yarn.lock | 93 ++++++------ 17 files changed, 63 insertions(+), 505 deletions(-) delete mode 100644 packages/wallet-base/package.json delete mode 100644 packages/wallet-base/src/index.ts delete mode 100644 packages/wallet-base/tsconfig.json delete mode 100644 packages/wallet-ledger/package.json delete mode 100644 packages/wallet-ledger/src/core.ts delete mode 100644 packages/wallet-ledger/src/index.ts delete mode 100644 packages/wallet-ledger/tsconfig.json diff --git a/packages/bridge-sdk/package.json b/packages/bridge-sdk/package.json index 41c7751..d5b1224 100644 --- a/packages/bridge-sdk/package.json +++ b/packages/bridge-sdk/package.json @@ -3,6 +3,7 @@ "version": "0.0.1", "dependencies": { "@solana/wallet-base": "0.0.1", + "@solana/wallet-ledger": "0.0.1", "@oyster/common": "0.0.1", "@solana/spl-token": "0.0.13", "@solana/spl-token-swap": "0.1.0", diff --git a/packages/bridge/package.json b/packages/bridge/package.json index 5d1152e..ffa7e3d 100644 --- a/packages/bridge/package.json +++ b/packages/bridge/package.json @@ -13,6 +13,7 @@ "@solana/spl-token-registry": "^0.2.0", "@solana/spl-token-swap": "0.1.0", "@solana/wallet-base": "0.0.1", + "@solana/wallet-ledger": "0.0.1", "@solana/web3.js": "^0.86.2", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", diff --git a/packages/bridge/src/components/Input/input.tsx b/packages/bridge/src/components/Input/input.tsx index 07a5205..77bb624 100644 --- a/packages/bridge/src/components/Input/input.tsx +++ b/packages/bridge/src/components/Input/input.tsx @@ -1,7 +1,7 @@ import React, { useEffect, useState } from 'react'; import { ConnectButton, - CurrentUserWalletBadge, + CurrentUserBadge, NumericInput, useMint, useUserAccounts, @@ -106,10 +106,7 @@ export function Input(props: { {props.chain === ASSET_CHAIN.Ethereum ? ( - ) : connected ? ( - - ) : ( - + ) : ( )} ); diff --git a/packages/common/package.json b/packages/common/package.json index ce615c2..9c2b065 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -30,6 +30,7 @@ "@solana/spl-token": "0.0.13", "@solana/spl-token-swap": "0.1.0", "@solana/wallet-base": "0.0.1", + "@solana/wallet-ledger": "0.0.1", "@solana/web3.js": "^0.86.2", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", diff --git a/packages/common/src/components/index.tsx b/packages/common/src/components/index.tsx index ef34e9c..78c3fb9 100644 --- a/packages/common/src/components/index.tsx +++ b/packages/common/src/components/index.tsx @@ -1,7 +1,6 @@ export { ExplorerLink } from './ExplorerLink/index'; export { ConnectButton } from './ConnectButton/index'; export { CurrentUserBadge } from './CurrentUserBadge/index'; -export { CurrentUserWalletBadge } from './CurrentUserWalletBadge/index'; export { Identicon } from './Identicon/index'; export { Info } from './Icons/info'; export { NumericInput } from './Input/numeric'; diff --git a/packages/lending/package.json b/packages/lending/package.json index af935de..fd8d473 100644 --- a/packages/lending/package.json +++ b/packages/lending/package.json @@ -3,6 +3,7 @@ "version": "0.1.0", "dependencies": { "@solana/wallet-base": "0.0.1", + "@solana/wallet-ledger": "0.0.1", "@ant-design/icons": "^4.4.0", "@ant-design/pro-layout": "^6.7.0", "@babel/preset-typescript": "^7.12.13", diff --git a/packages/metavinci/package.json b/packages/metavinci/package.json index c4434a4..c477027 100644 --- a/packages/metavinci/package.json +++ b/packages/metavinci/package.json @@ -13,6 +13,7 @@ "@solana/spl-token-registry": "^0.2.0", "@solana/spl-token-swap": "0.1.0", "@solana/wallet-base": "0.0.1", + "@solana/wallet-ledger": "0.0.1", "@solana/web3.js": "^0.86.2", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.5.0", diff --git a/packages/metavinci/src/views/auctionCreate/index.tsx b/packages/metavinci/src/views/auctionCreate/index.tsx index e98f2e1..7a1f712 100644 --- a/packages/metavinci/src/views/auctionCreate/index.tsx +++ b/packages/metavinci/src/views/auctionCreate/index.tsx @@ -119,7 +119,7 @@ export const AuctionCreateView = () => { /> )} {step === 1 && ( - gotoStep(2)} @@ -230,7 +230,7 @@ const CategoryStep = (props: { confirm: (category: MetadataCategory) => void }) ); }; -const UploadStep = (props: { +const SelectItemsStep = (props: { attributes: IMetadataExtension; setAttributes: (attr: IMetadataExtension) => void; confirm: () => void; @@ -246,93 +246,17 @@ const UploadStep = (props: { }) }, []) - const uploadMsg = (category: MetadataCategory) => { - switch (category) { - case MetadataCategory.Audio: - return "Upload your audio creation (MP3, FLAC, WAV)" - case MetadataCategory.Image: - return "Upload your image creation (PNG, JPG, GIF)" - case MetadataCategory.Video: - return "Upload your video creation (MP4)" - default: - return "Please go back and choose a category" - } - } return ( <> -

Now, let's upload your creation

+

Select which item to sell

- Your file will be uploaded to the decentralized web via Arweave. - Depending on file type, can take up to 1 minute. Arweave is a new type - of storage that backs data with sustainable and perpetual endowments, - allowing users and developers to truly store data forever – for the - very first time. + Select the item(s) that you want to list.

-

{uploadMsg(props.attributes.category)}

- { - // dont upload files here, handled outside of the control - info?.onSuccess?.({}, null as any) - }} - fileList={mainFile ? [mainFile] : []} - onChange={async info => { - const file = info.file.originFileObj; - if (file) setMainFile(file) - if (props.attributes.category != MetadataCategory.Audio) { - const reader = new FileReader(); - reader.onload = function (event) { - setImage((event.target?.result as string) || '') - } - if (file) reader.readAsDataURL(file) - } - }} - > -
-

Upload your creation

-
-

- Drag and drop, or click to browse -

- - {props.attributes.category == MetadataCategory.Audio && - -

Optionally, you can upload a cover image or video (PNG, JPG, GIF, MP4)

- { - // dont upload files here, handled outside of the control - info?.onSuccess?.({}, null as any) - }} - fileList={coverFile ? [coverFile] : []} - onChange={async info => { - const file = info.file.originFileObj; - if (file) setCoverFile(file) - if (props.attributes.category == MetadataCategory.Audio) { - const reader = new FileReader(); - reader.onload = function (event) { - setImage((event.target?.result as string) || '') - } - if (file) reader.readAsDataURL(file) - } - }} - > -
-

Upload your cover image or video

-
-

- Drag and drop, or click to browse -

- - - }