Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,235 changes: 1,095 additions & 140 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
},
"dependencies": {
"@apollo/client": "^3.8.1",
"@bosonprotocol/chat-sdk": "^1.3.1-alpha.16",
"@bosonprotocol/react-kit": "^0.39.2-alpha.3",
"@bosonprotocol/chat-sdk": "^1.3.1-alpha.20",
"@bosonprotocol/react-kit": "^0.40.1-alpha.1",
"@davatar/react": "^1.10.4",
"@ethersproject/address": "^5.6.1",
"@ethersproject/units": "^5.7.0",
Expand Down
3 changes: 2 additions & 1 deletion src/components/detail/DetailWidget/CommitDetailWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ export const CommitDetailWidget: React.FC<CommitDetailWidgetProps> = ({
offer.exchangeToken.address,
constants.MaxInt256,
{
spender: commitProxyAddress
spender: commitProxyAddress,
returnTxInfo: false
}
);
await tx.wait();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,12 @@ export default function RefundRequest({ exchange, iAmTheBuyer }: Props) {
if (isNaN(valueAsNumber)) {
return;
}
const valueInDecimals: string = formatIntValueToDecimals(
BigNumber.from(inEscrow)
.mul(valueAsNumber * 1000)
.div(100 * 1000)
.toString()
);
const valueAsString = BigNumber.from(inEscrow)
.mul(valueAsNumber * 1000)
.div(100 * 1000)
.toString();
const valueInDecimals: string =
formatIntValueToDecimals(valueAsString);
setFieldValue(
FormModel.formFields.refundAmount.name,
valueInDecimals,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
MessageType,
ThreadId,
version
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
} from "@bosonprotocol/chat-sdk";
import { TransactionResponse } from "@bosonprotocol/common";
import { CoreSDK, hooks, Provider, subgraph } from "@bosonprotocol/react-kit";
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
MessageType,
ThreadId,
version
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
} from "@bosonprotocol/chat-sdk";
import { TransactionResponse } from "@bosonprotocol/common";
import { CoreSDK, hooks, Provider, subgraph } from "@bosonprotocol/react-kit";
import {
Expand Down
2 changes: 1 addition & 1 deletion src/components/modal/components/RetractDisputeModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
MessageType,
ThreadId,
version
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
} from "@bosonprotocol/chat-sdk";
import { TransactionResponse } from "@bosonprotocol/common";
import { CoreSDK, hooks, Provider, subgraph } from "@bosonprotocol/react-kit";
import {
Expand Down
4 changes: 2 additions & 2 deletions src/components/seller/exchanges/SellerExchanges.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ThreadId } from "@bosonprotocol/chat-sdk/dist/cjs/util/v0.0.1/definitions";
import { ThreadObject } from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { ThreadId } from "@bosonprotocol/chat-sdk";
import { ThreadObject } from "@bosonprotocol/chat-sdk";
import { exchanges as ExchangesKit, subgraph } from "@bosonprotocol/react-kit";
import * as Sentry from "@sentry/browser";
import { createWorkerFactory, useWorker } from "@shopify/react-web-worker";
Expand Down
7 changes: 2 additions & 5 deletions src/lib/utils/hooks/chat/common.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import {
MessageData,
ThreadObject
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { matchThreadIds } from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/functions";
import { MessageData, ThreadObject } from "@bosonprotocol/chat-sdk";
import { matchThreadIds } from "@bosonprotocol/chat-sdk";
import dayjs from "dayjs";

export type DateStep =
Expand Down
9 changes: 3 additions & 6 deletions src/lib/utils/hooks/chat/getThreadWorker.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import { BosonXmtpClient } from "@bosonprotocol/chat-sdk";
import {
ThreadId,
ThreadObject
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { BosonXmtpBrowserClient } from "@bosonprotocol/chat-sdk";
import { ThreadId, ThreadObject } from "@bosonprotocol/chat-sdk";
import dayjs from "dayjs";
import { MutableRefObject } from "react";

Expand All @@ -29,7 +26,7 @@ export async function getThread({
checkCustomCondition,
stopRef
}: {
bosonXmtp: BosonXmtpClient;
bosonXmtp: BosonXmtpBrowserClient;
threadId: ThreadId;
counterParty: string;
dateIndex: number;
Expand Down
4 changes: 2 additions & 2 deletions src/lib/utils/hooks/chat/useChatStatus.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BosonXmtpClient } from "@bosonprotocol/chat-sdk";
import { BosonXmtpBrowserClient } from "@bosonprotocol/chat-sdk";
import { useConfigContext } from "components/config/ConfigContext";
import { useEffect, useState } from "react";

Expand Down Expand Up @@ -41,7 +41,7 @@ export const useChatStatus = (): {
return;
}
setChatInitializationStatus(ChatInitializationStatus.INITIALIZING);
BosonXmtpClient.isXmtpEnabled(
BosonXmtpBrowserClient.isXmtpEnabled(
address,
config.envConfig.envName === "production" ? "production" : "dev",
chatEnvName
Expand Down
7 changes: 2 additions & 5 deletions src/lib/utils/hooks/chat/useInfiniteThread.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import {
ThreadId,
ThreadObject
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { validateMessage } from "@bosonprotocol/chat-sdk/dist/esm/util/validators";
import { ThreadId, ThreadObject } from "@bosonprotocol/chat-sdk";
import { validateMessage } from "@bosonprotocol/chat-sdk";
import { createWorkerFactory, useWorker } from "@shopify/react-web-worker";
import { utils } from "ethers";
import { useCallback, useEffect, useRef, useState } from "react";
Expand Down
15 changes: 13 additions & 2 deletions src/lib/utils/hooks/offer/useCreateOffers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,12 +202,22 @@ export function useCreateOffers() {
);
const decimals = await onBeforeBuildCondition();
const condition = buildCondition(tokenGatedInfo, decimals);

const sellerAddress = sellerToCreate?.assistant;
if (!sellerAddress) {
throw new Error(`sellerAddress is falsy "${sellerAddress}"`);
}
const seller = await coreSDK.getSellerByAssistant(sellerAddress);
if (!seller) {
throw new Error(
`seller could not be found with this address="${sellerAddress}"`
);
}
const sellerId = seller.id;
if (isMetaTx) {
const nonce = Date.now();
const { r, s, v, functionName, functionSignature } =
await coreSDK.signMetaTxCreateGroup({
createGroupArgs: { offerIds, ...condition },
createGroupArgs: { offerIds, sellerId, ...condition },
nonce
});
txResponse = await coreSDK.relayMetaTransaction({
Expand All @@ -221,6 +231,7 @@ export function useCreateOffers() {
} else {
txResponse = await coreSDK.createGroup({
offerIds,
sellerId,
...condition
});
}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/chat/ChatProvider/ChatContext.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { BosonXmtpClient } from "@bosonprotocol/chat-sdk";
import { BosonXmtpBrowserClient } from "@bosonprotocol/chat-sdk";
import { createContext, Dispatch, SetStateAction, useContext } from "react";

import { getChatEnvName } from "./const";

export const Context = createContext<{
bosonXmtp: BosonXmtpClient | undefined;
bosonXmtp: BosonXmtpBrowserClient | undefined;
initialize: Dispatch<SetStateAction<void>>;
chatEnvName: ReturnType<typeof getChatEnvName> | null;
error: unknown;
Expand Down
6 changes: 3 additions & 3 deletions src/pages/chat/ChatProvider/ChatProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BosonXmtpClient } from "@bosonprotocol/chat-sdk";
import { BosonXmtpBrowserClient } from "@bosonprotocol/chat-sdk";
import * as Sentry from "@sentry/browser";
import { useConfigContext } from "components/config/ConfigContext";
import { ReactNode, useEffect, useState } from "react";
Expand All @@ -18,12 +18,12 @@ export default function ChatProvider({ children }: Props) {
const [initialize, setInitialized] = useState<number>(0);
const [isLoading, setLoading] = useState<boolean>(false);
const [error, setError] = useState<unknown>();
const [bosonXmtp, setBosonXmtp] = useState<BosonXmtpClient>();
const [bosonXmtp, setBosonXmtp] = useState<BosonXmtpBrowserClient>();
const chatEnvName = getChatEnvName(config);
useEffect(() => {
if (signer && initialize && !bosonXmtp) {
setLoading(true);
BosonXmtpClient.initialise(
BosonXmtpBrowserClient.initialise(
signer,
config.envConfig.envName === "production" ? "production" : "dev",
chatEnvName
Expand Down
5 changes: 1 addition & 4 deletions src/pages/chat/components/ExchangeSidePreview.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import {
MessageData,
ThreadId
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { MessageData, ThreadId } from "@bosonprotocol/chat-sdk";
import { offers, subgraph } from "@bosonprotocol/react-kit";
import {
buyerAndSellerAgreementIncluding,
Expand Down
5 changes: 1 addition & 4 deletions src/pages/chat/components/ExchangeTimeline.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
/* eslint @typescript-eslint/no-explicit-any: "off" */
import {
MessageData,
MessageType
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { MessageData, MessageType } from "@bosonprotocol/chat-sdk";
import { subgraph } from "@bosonprotocol/react-kit";
import dayjs from "dayjs";
import { ReactNode, useMemo } from "react";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/chat/components/Message.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
ProposalContent,
StringContent,
StringIconContent
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
} from "@bosonprotocol/chat-sdk";
import { subgraph } from "@bosonprotocol/react-kit";
import { Check, Clock } from "phosphor-react";
import React, {
Expand Down
8 changes: 4 additions & 4 deletions src/pages/chat/components/conversation/ChatConversation.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { BosonXmtpClient } from "@bosonprotocol/chat-sdk/dist/esm/index";
import {
MessageData,
MessageType,
ProposalContent,
ThreadId
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { validateMessage } from "@bosonprotocol/chat-sdk/dist/esm/util/validators";
} from "@bosonprotocol/chat-sdk";
import { validateMessage } from "@bosonprotocol/chat-sdk";
import { BosonXmtpBrowserClient } from "@bosonprotocol/chat-sdk";
import { subgraph } from "@bosonprotocol/react-kit";
import * as Sentry from "@sentry/browser";
import { utils } from "ethers";
Expand Down Expand Up @@ -436,7 +436,7 @@ const ChatConversation = ({
destinationAddress
}: {
threadId: ThreadId;
bosonXmtp: BosonXmtpClient;
bosonXmtp: BosonXmtpBrowserClient;
destinationAddress: string;
}) => {
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import {
MessageData,
MessageType
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { MessageData, MessageType } from "@bosonprotocol/chat-sdk";
import { subgraph } from "@bosonprotocol/react-kit";
import * as Sentry from "@sentry/browser";
import React, { useEffect, useState } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MessageData } from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { MessageData } from "@bosonprotocol/chat-sdk";
import { subgraph } from "@bosonprotocol/react-kit";

import { getExchangeDisputeDates } from "../../../../../lib/utils/exchange";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import {
MessageData,
ProposalContent
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { MessageData, ProposalContent } from "@bosonprotocol/chat-sdk";
import { Check, Info, X } from "phosphor-react";
import { Dispatch, SetStateAction, useState } from "react";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import {
MessageData,
ProposalContent
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { MessageData, ProposalContent } from "@bosonprotocol/chat-sdk";
import { BigNumber } from "ethers";
import { Info, X } from "phosphor-react";
import { useState } from "react";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
import {
MessageData,
ProposalContent
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { MessageData, ProposalContent } from "@bosonprotocol/chat-sdk";
import { Check, Info, X } from "phosphor-react";
import { Dispatch, SetStateAction, useState } from "react";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
AcceptProposalContent,
MessageData,
ProposalContent
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
} from "@bosonprotocol/chat-sdk";
import { useAccount } from "lib/utils/hooks/connection/connection";
import { Info, X } from "phosphor-react";
import { useState } from "react";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/chat/components/conversation/ChatInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
MessageType,
ThreadId,
version
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
} from "@bosonprotocol/chat-sdk";
import { subgraph } from "@bosonprotocol/react-kit";
import * as Sentry from "@sentry/browser";
import { defaultFontFamily } from "lib/styles/fonts";
Expand Down
6 changes: 3 additions & 3 deletions src/pages/chat/components/conversation/Messages.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { BosonXmtpClient } from "@bosonprotocol/chat-sdk";
import { MessageData } from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { BosonXmtpBrowserClient } from "@bosonprotocol/chat-sdk";
import { MessageData } from "@bosonprotocol/chat-sdk";
import { subgraph } from "@bosonprotocol/react-kit";
import dayjs from "dayjs";
import { Exchange } from "lib/utils/hooks/useExchanges";
Expand Down Expand Up @@ -70,7 +70,7 @@ const LoadMoreMessages = styled.button.attrs({ type: "button" })`
`;

const getWasItSentByMe = (
bosonXmtp: BosonXmtpClient | undefined,
bosonXmtp: BosonXmtpBrowserClient | undefined,
sender: string
) => {
return bosonXmtp?.inboxId === sender;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/chat/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
MessageData,
ProposalContent,
ThreadObject
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
} from "@bosonprotocol/chat-sdk";

import type SellerID from "../../components/ui/SellerID";
import { Exchange } from "../../lib/utils/hooks/useExchanges";
Expand Down
10 changes: 5 additions & 5 deletions src/pages/chat/utils/send.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BosonXmtpClient } from "@bosonprotocol/chat-sdk";
import { BosonXmtpBrowserClient } from "@bosonprotocol/chat-sdk";
import {
FileContent,
MessageData,
Expand All @@ -8,7 +8,7 @@ import {
SupportedFileMimeTypes,
ThreadId,
version
} from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
} from "@bosonprotocol/chat-sdk";
import { getHasUserRejectedTx } from "@bosonprotocol/react-kit";
import { utils } from "ethers";

Expand All @@ -24,7 +24,7 @@ export const sendFilesToChat = async ({
callbackSendingMessage,
callback
}: {
bosonXmtp: BosonXmtpClient;
bosonXmtp: BosonXmtpBrowserClient;
files: FileWithEncodedData[];
destinationAddress: string;
threadId: ThreadId;
Expand Down Expand Up @@ -74,7 +74,7 @@ export const sendProposalToChat = async ({
callback,
type
}: {
bosonXmtp: BosonXmtpClient;
bosonXmtp: BosonXmtpBrowserClient;
proposal: ProposalContent["value"];
files: FileWithEncodedData[];
destinationAddress: string;
Expand Down Expand Up @@ -190,7 +190,7 @@ export const sendAndAddMessageToUI = async ({
destinationAddress,
newMessage
}: {
bosonXmtp: BosonXmtpClient;
bosonXmtp: BosonXmtpBrowserClient;
addMessage?:
| ((
newMessageOrList: MessageDataWithInfo | MessageDataWithInfo[]
Expand Down
2 changes: 1 addition & 1 deletion src/pages/dispute-centre/RaiseDisputePage.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MessageType } from "@bosonprotocol/chat-sdk/dist/esm/util/v0.0.1/definitions";
import { MessageType } from "@bosonprotocol/chat-sdk";
import { TransactionResponse } from "@bosonprotocol/common";
import { CoreSDK, hooks, Provider, subgraph } from "@bosonprotocol/react-kit";
import {
Expand Down
Loading