Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
albertfolch-redeemeum committed Dec 12, 2024
1 parent e7dde77 commit 7aaed82
Show file tree
Hide file tree
Showing 27 changed files with 790 additions and 329 deletions.
7 changes: 4 additions & 3 deletions packages/react-kit/src/assets/svg/blank_token.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 7 additions & 4 deletions packages/react-kit/src/assets/wallets/browser-wallet-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 48 additions & 14 deletions packages/react-kit/src/assets/wallets/metamask-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 22 additions & 16 deletions packages/react-kit/src/assets/wallets/trustwallet-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { useEffect, useMemo, useRef, useState } from "react";
import { styled } from "styled-components";
import OfferPolicyDetails from "../../../offerPolicy/OfferPolicyDetails";
import { subgraph } from "@bosonprotocol/core-sdk";
import ContractualAgreement from "../../../contractualAgreement/ContractualAgreement";
import License from "../../../license/License";
import * as Yup from "yup";
Expand All @@ -27,6 +26,7 @@ import { mockedDeliveryAddress } from "../../../widgets/redemption/const";
import { checkSignatures } from "../Redeem/checkSignatures";
import Loading from "../../../ui/loading/LoadingWrapper";
import { useCurrentSellers } from "../../../../hooks/useCurrentSellers";
import { BosonRobloxExchange } from "../../../../hooks/roblox/backend.types";

const Wrapper = styled.div``;

Expand All @@ -46,15 +46,13 @@ export type RequestShipmentModalProps = Pick<
| "redemptionSubmittedHandler"
| "redemptionConfirmedHandler"
> & {
offer: subgraph.OfferFieldsFragment;
exchange: subgraph.ExchangeFieldsFragment;
exchange: BosonRobloxExchange;
forcedAccount?: string;
parentOrigin?: string | null;
signatures?: string[] | null;
};
const initialStep = ActiveStep.EXCHANGE_POLICY_OVERVIEW;
export const RequestShipmentModal = ({
offer,
exchange,
parentOrigin,
signatures,
Expand All @@ -64,6 +62,7 @@ export const RequestShipmentModal = ({
redemptionConfirmedHandler,
redemptionSubmittedHandler
}: RequestShipmentModalProps) => {
const { offer } = exchange;
const offerId = offer.id;
const offerName = exchange?.offer?.metadata?.name || "";
const buyerId = exchange?.buyer.id || "";
Expand Down
12 changes: 12 additions & 0 deletions packages/react-kit/src/components/ui/Grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ const pickedProps = {
marginRight: true,
marginBottom: true,
marginLeft: true,
paddingTop: true,
paddingRight: true,
paddingBottom: true,
paddingLeft: true,
width: true,
height: true,
maxWidth: true,
Expand Down Expand Up @@ -72,6 +76,14 @@ const Container = styled.div<InnerGridProps>`
isDefined($marginBottom) ? `margin-bottom:${$marginBottom};` : ""}
${({ $marginLeft }) =>
isDefined($marginLeft) ? `margin-left:${$marginLeft};` : ""}
${({ $paddingTop }) =>
isDefined($paddingTop) ? `padding-top:${$paddingTop};` : ""}
${({ $paddingRight }) =>
isDefined($paddingRight) ? `padding-right:${$paddingRight};` : ""}
${({ $paddingBottom }) =>
isDefined($paddingBottom) ? `padding-bottom:${$paddingBottom};` : ""}
${({ $paddingLeft }) =>
isDefined($paddingLeft) ? `padding-left:${$paddingLeft};` : ""}
${({ $alignSelf }) =>
isDefined($alignSelf) ? `align-self:${$alignSelf};` : ""}
${({ $justifySelf }) =>
Expand Down
Loading

0 comments on commit 7aaed82

Please sign in to comment.