Skip to content

Commit

Permalink
feat: get config id from query params
Browse files Browse the repository at this point in the history
  • Loading branch information
albertfolch-redeemeum committed Sep 8, 2023
1 parent 6eedaca commit 3373066
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ REACT_APP_ENV_NAME=testing
# REACT_APP_ENV_NAME=staging
# REACT_APP_ENV_NAME=production

REACT_APP_CONFIG_ID=testing-80001-0

# Infura IPFS project ID, used for auth header
REACT_APP_INFURA_IPFS_PROJECT_ID=

Expand Down
9 changes: 6 additions & 3 deletions src/components/widgets/finance/Finance.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { FinanceWidget } from "@bosonprotocol/react-kit";
import { ConfigId, FinanceWidget } from "@bosonprotocol/react-kit";
import { useSearchParams } from "react-router-dom";

import { CONFIG } from "../../../config";
Expand All @@ -10,11 +10,14 @@ export function Finance() {
if (!sellerId) {
return <p>Missing 'sellerId' query param</p>;
}

const configId = searchParams.get("configId") as ConfigId;
if (!configId) {
return <p>Missing 'configId' query param</p>;
}
return (
<FinanceWidget
sellerId={sellerId}
configId={CONFIG.configId}
configId={configId}
envName={CONFIG.envName}
metaTx={{
apiKey: CONFIG.metaTxApiKey as string,
Expand Down
5 changes: 4 additions & 1 deletion src/components/widgets/finance/FinanceDisplay.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
import { getEnvConfigs } from "@bosonprotocol/react-kit";
import CodeCopy from "react-codecopy";
import { Link } from "react-router-dom";

import { CONFIG } from "../../../config";
import { Pre, Widget } from "../styles";
import { financePath } from "./Finance";

export function FinanceDisplay() {
const financeQPobj = {
sellerId: "25"
sellerId: "25",
configId: getEnvConfigs(CONFIG.envName)[0].configId
};
const financeQP = new URLSearchParams(
Object.entries(financeQPobj)
Expand Down
7 changes: 6 additions & 1 deletion src/components/widgets/redeem/Redeem.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
ConfigId,
RedemptionBypassMode,
RedemptionWidget
} from "@bosonprotocol/react-kit";
Expand Down Expand Up @@ -27,11 +28,15 @@ export function Redeem() {
);
}
}
const configId = searchParams.get("configId") as ConfigId;
if (!configId) {
return <p>Missing 'configId' query param</p>;
}

return (
<RedemptionWidget
exchangeId={exchangeId}
configId={CONFIG.configId}
configId={configId}
envName={CONFIG.envName}
metaTx={{
apiKey: CONFIG.metaTxApiKey as string,
Expand Down
6 changes: 5 additions & 1 deletion src/components/widgets/redeem/RedeemDisplay.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import { getEnvConfigs } from "@bosonprotocol/react-kit";
import CodeCopy from "react-codecopy";
import { Link } from "react-router-dom";

import { CONFIG } from "../../../config";
import { Pre, Widget } from "../styles";
import { redeemPath } from "./Redeem";

export function RedeemDisplay() {
const redeemQPobj = {};
const redeemQPobj = {
configId: getEnvConfigs(CONFIG.envName)[0].configId
};
const redeemQP = new URLSearchParams(Object.entries(redeemQPobj)).toString();
const title = "Redeem widget";
const width = "100%";
Expand Down
8 changes: 1 addition & 7 deletions src/config.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
import { ConfigId, EnvironmentType } from "@bosonprotocol/react-kit";
import { EnvironmentType } from "@bosonprotocol/react-kit";
import { Buffer } from "buffer";

const envName = process.env.REACT_APP_ENV_NAME as EnvironmentType;
const configId = process.env.REACT_APP_CONFIG_ID as ConfigId;

if (!envName || ["testing", "staging", "production"].indexOf(envName) < 0) {
throw `REACT_APP_ENV_NAME env variable is missing or invalid ('${envName}')`;
}

if (!configId) {
throw `REACT_APP_CONFIG_ID env variable is missing ('${configId}')`;
}

type ConfigFields =
| "defaultTokens"
| "defaultDisputeResolverId"
Expand Down Expand Up @@ -129,7 +124,6 @@ if (!_CONFIG) {

export const CONFIG = {
envName,
configId,
ipfsMetadataStorageHeaders: getIpfsMetadataStorageHeaders(
process.env.REACT_APP_INFURA_IPFS_PROJECT_ID,
process.env.REACT_APP_INFURA_IPFS_PROJECT_SECRET
Expand Down

0 comments on commit 3373066

Please sign in to comment.