Skip to content
Merged
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
2 changes: 0 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ REACT_APP_RELEASE_NAME=

REACT_APP_WALLET_CONNECT_PROJECT_ID=

REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP='{"production-137-0":"248", "testing-80001-0":"26"}'

REACT_APP_VIEW_MODE=dapp
# REACT_APP_VIEW_MODE=dr_center
# REACT_APP_VIEW_MODE=dapp,dr_center
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
REACT_APP_MOONPAY_EXTERNAL_LINK: "https://www.moonpay.com/buy"
REACT_APP_META_TX_API_KEY_MAP: ${{ vars.REACT_APP_META_TX_API_KEY_MAP_TESTING }}
REACT_APP_META_TX_API_IDS_MAP: ${{ vars.REACT_APP_META_TX_API_IDS_MAP_TESTING }}
REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP: ${{ vars.REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP }}
secrets:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
Expand Down Expand Up @@ -94,7 +93,6 @@ jobs:
REACT_APP_MOONPAY_EXTERNAL_LINK: "https://www.moonpay.com/buy"
REACT_APP_META_TX_API_KEY_MAP: ${{ vars.REACT_APP_META_TX_API_KEY_MAP_TESTING }}
REACT_APP_META_TX_API_IDS_MAP: ${{ vars.REACT_APP_META_TX_API_IDS_MAP_TESTING }}
REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP: ${{ vars.REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP }}
secrets:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
FLEEK_API_KEY: ${{ secrets.FLEEK_API_KEY }}
Expand Down Expand Up @@ -134,7 +132,6 @@ jobs:
REACT_APP_MOONPAY_EXTERNAL_LINK: "https://www.moonpay.com/buy"
REACT_APP_META_TX_API_KEY_MAP: ${{ vars.REACT_APP_META_TX_API_KEY_MAP_STAGING }}
REACT_APP_META_TX_API_IDS_MAP: ${{ vars.REACT_APP_META_TX_API_IDS_MAP_STAGING }}
REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP: ${{ vars.REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP }}
secrets:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
FLEEK_API_KEY: ${{ secrets.FLEEK_API_KEY }}
Expand Down Expand Up @@ -174,7 +171,6 @@ jobs:
REACT_APP_MOONPAY_EXTERNAL_LINK: "https://www.moonpay.com/buy"
REACT_APP_META_TX_API_KEY_MAP: ${{ vars.REACT_APP_META_TX_API_KEY_MAP_PRODUCTION }}
REACT_APP_META_TX_API_IDS_MAP: ${{ vars.REACT_APP_META_TX_API_IDS_MAP_PRODUCTION }}
REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP: ${{ vars.REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP }}
secrets:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
FLEEK_API_KEY: ${{ secrets.FLEEK_API_KEY }}
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci_reusable.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,6 @@ on:
REACT_APP_META_TX_API_IDS_MAP:
required: true
type: string
REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP:
required: true
type: string
secrets:
NPM_TOKEN:
required: true
Expand Down Expand Up @@ -121,7 +118,6 @@ jobs:
REACT_APP_DEFAULT_RESOLUTION_PERIOD_DAYS: ${{ secrets.REACT_APP_DEFAULT_RESOLUTION_PERIOD_DAYS }}
REACT_APP_INFURA_IPFS_PROJECT_ID: ${{ secrets.REACT_APP_INFURA_IPFS_PROJECT_ID }}
REACT_APP_INFURA_IPFS_PROJECT_SECRET: ${{ secrets.REACT_APP_INFURA_IPFS_PROJECT_SECRET }}
REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP: ${{ inputs.REACT_APP_CAROUSEL_PROMOTED_SELLER_ID_MAP }}
REACT_APP_GOOGLE_TAG_ID: ${{ secrets.REACT_APP_GOOGLE_TAG_ID }}
REACT_APP_META_TX_API_KEY_MAP: ${{ inputs.REACT_APP_META_TX_API_KEY_MAP }}
REACT_APP_META_TX_API_IDS_MAP: ${{ inputs.REACT_APP_META_TX_API_IDS_MAP }}
Expand Down
42 changes: 21 additions & 21 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.34.0-alpha.20",
"@bosonprotocol/react-kit": "^0.34.0-alpha.23",
"@davatar/react": "^1.10.4",
"@ethersproject/address": "^5.6.1",
"@ethersproject/units": "^5.7.0",
Expand Down
32 changes: 28 additions & 4 deletions src/components/config/ConfigProvider.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
import { ProtocolConfig } from "@bosonprotocol/react-kit";
import {
ConfigProvider as BosonConfigProvider,
ProtocolConfig
} from "@bosonprotocol/react-kit";
import { MagicProvider } from "components/magicLink/MagicContext";
import {
CONFIG,
defaultEnvConfig,
envConfigsFilteredByEnv,
getDappConfig
Expand Down Expand Up @@ -35,9 +39,29 @@ export function ConfigProvider({ children }: ConfigProviderProps) {
const dappConfig = getDappConfig(envConfig || defaultEnvConfig);
return (
<Context.Provider value={{ config: dappConfig, setEnvConfig }}>
<MagicProvider>
<SyncCurrentConfigId>{children}</SyncCurrentConfigId>
</MagicProvider>
<BosonConfigProvider
dateFormat={CONFIG.dateFormat}
{...{
configId: dappConfig.envConfig.configId,
envName: dappConfig.envName,
shortDateFormat: CONFIG.shortDateFormat,
infuraKey: CONFIG.infuraKey,
walletConnectProjectId: CONFIG.walletConnect.projectId,
defaultCurrencySymbol: CONFIG.defaultCurrency.symbol,
defaultCurrencyTicker: CONFIG.defaultCurrency.ticker,
licenseTemplate: CONFIG.rNFTLicenseTemplate,
minimumDisputeResolutionPeriodDays: CONFIG.minimumDisputePeriodInDays,
contactSellerForExchangeUrl: "",
withExternalConnectionProps: true,
withReduxProvider: false,
withWeb3React: false,
withCustomReduxContext: false
}}
>
<MagicProvider>
<SyncCurrentConfigId>{children}</SyncCurrentConfigId>
</MagicProvider>
</BosonConfigProvider>
</Context.Provider>
);
}
23 changes: 0 additions & 23 deletions src/components/detail/Detail.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -197,29 +197,6 @@ export const ImageWrapper = styled.div`
width: -webkit-fill-available;
`;

export const GlideWrapper = styled.div<{ $afterBackground: string }>`
&:after {
content: "";
position: absolute;
height: 100%;
width: 4rem;
z-index: ${zIndex.Carousel};
top: 0;
bottom: 0;
right: 0;
background: linear-gradient(
-90deg,
${({ $afterBackground }) => $afterBackground} 0%,
transparent 100%
);
pointer-events: none;
}
`;

export const GlideSlide = styled.div`
overflow: hidden;
`;

const tableBorder = css`
tbody {
tr {
Expand Down
44 changes: 0 additions & 44 deletions src/components/detail/const.ts

This file was deleted.

Loading