Skip to content

Commit

Permalink
chore: upgrade react-kit version (#1086)
Browse files Browse the repository at this point in the history
Co-authored-by: Ludovic Levalleux <[email protected]>
  • Loading branch information
albertfolch-redeemeum and levalleux-ludo committed Jun 11, 2024
1 parent 394a9df commit 826f7e8
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 58 deletions.
106 changes: 64 additions & 42 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"dependencies": {
"@apollo/client": "^3.8.1",
"@bosonprotocol/chat-sdk": "^1.3.1-alpha.9",
"@bosonprotocol/react-kit": "^0.32.0-alpha.1",
"@bosonprotocol/react-kit": "^0.32.0",
"@davatar/react": "^1.10.4",
"@ethersproject/address": "^5.6.1",
"@ethersproject/units": "^5.7.0",
Expand Down
49 changes: 43 additions & 6 deletions src/CoreComponentsUpdaters.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,51 @@
import { CommitWidgetReduxUpdaters, hooks } from "@bosonprotocol/react-kit";
import { useProvider } from "lib/utils/hooks/connection/connection";
import {
CommitWidgetReduxUpdaters,
ConfigProvider,
hooks
} from "@bosonprotocol/react-kit";
import { useConfigContext } from "components/config/ConfigContext";
import { CONFIG } from "lib/config";
import {
useAccount,
useChainId,
useProvider,
useSigner
} from "lib/utils/hooks/connection/connection";
import React from "react";

export const CoreComponentsUpdaters: React.FC = () => {
const provider = useProvider();
const isWindowVisible = hooks.useIsWindowVisible();
const { config } = useConfigContext();
const connectedChainId = useChainId();
const { account } = useAccount();
const signer = useSigner();
return (
<CommitWidgetReduxUpdaters
isWindowVisible={isWindowVisible}
provider={provider}
/>
<ConfigProvider
{...{
...CONFIG,
envName: config.envName,
configId: config.envConfig.configId,
withWeb3React: false,
withCustomReduxContext: false,
defaultCurrencySymbol: CONFIG.defaultCurrency.symbol,
defaultCurrencyTicker: CONFIG.defaultCurrency.ticker,
licenseTemplate: CONFIG.rNFTLicenseTemplate,
minimumDisputeResolutionPeriodDays: CONFIG.minimumDisputePeriodInDays,
walletConnectProjectId: CONFIG.walletConnect.projectId,
ipfsProjectId: CONFIG.infuraProjectId,
ipfsProjectSecret: CONFIG.infuraProjectSecret,
withExternalConnectionProps: true,
externalConnectedChainId: connectedChainId,
externalConnectedAccount: account,
externalConnectedSigner: signer
}}
>
<CommitWidgetReduxUpdaters
isWindowVisible={isWindowVisible}
provider={provider}
withWeb3React={false}
/>
</ConfigProvider>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@ export const BasicCommitDetailWidget: React.FC<
contactSellerForExchangeUrl: "",
sellerCurationListBetweenCommas:
curationLists?.sellerCurationList?.join(",") || "",
withReduxProvider: false
withReduxProvider: false,
withCustomReduxContext: false,
withWeb3React: false
}}
selectedVariant={selectedVariant}
showPriceAsterisk={isPreview}
Expand Down
4 changes: 3 additions & 1 deletion src/components/detail/DetailWidget/CommitDetailWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,9 @@ export const CommitDetailWidget: React.FC<CommitDetailWidgetProps> = ({
externalConnectedChainId: connectedChainId,
externalConnectedAccount: account,
externalConnectedSigner: signer,
withReduxProvider: false
withReduxProvider: false,
withWeb3React: false,
withCustomReduxContext: false
}}
selectedVariant={selectedVariant}
showPriceAsterisk={isPreview}
Expand Down
5 changes: 4 additions & 1 deletion src/components/detail/DetailWidget/ExchangeDetailWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,10 @@ export const ExchangeDetailWidget: React.FC<ExchangeDetailWidgetProps> = ({
withExternalConnectionProps: true,
externalConnectedChainId: connectedChainId,
externalConnectedAccount: address,
externalConnectedSigner: signer
externalConnectedSigner: signer,
withWeb3React: false,
withCustomReduxContext: false,
withReduxProvider: false
}}
showBosonLogo={isCustomStoreFront}
showPriceAsterisk={false}
Expand Down
5 changes: 3 additions & 2 deletions src/components/header/walletModal/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { MagicLoginButton } from "@bosonprotocol/react-kit";
import { bosonButtonThemes, MagicLoginButton } from "@bosonprotocol/react-kit";
import { useWeb3React } from "@web3-react/core";
import { LinkWithQuery } from "components/customNavigation/LinkWithQuery";
import { AutoColumn } from "components/ui/column";
Expand Down Expand Up @@ -97,7 +97,8 @@ export default function WalletModal() {
</OptionGrid>
<MagicLoginButton
buttonProps={{
style: {
theme: {
...bosonButtonThemes({ withBosonStyle: false })["primary"],
color: magicLoginTextColor
}
}}
Expand Down
4 changes: 1 addition & 3 deletions src/components/header/web3Provider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ export default function Web3Provider({ children }: { children: ReactNode }) {

/** A component to run hooks under the Web3ReactProvider context. */
function Updater() {
const { account } = useWeb3React();

const { connector } = useWeb3React();
const { account, connector } = useWeb3React();

const previousAccount = usePrevious(account);
const [, addConnectedWallet] = useConnectedWallets();
Expand Down
Loading

0 comments on commit 826f7e8

Please sign in to comment.