Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
albertfolch-redeemeum committed Jan 24, 2025
1 parent 504e4a1 commit 6946bd6
Show file tree
Hide file tree
Showing 24 changed files with 48 additions and 54 deletions.
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.36.0-alpha.6",
"@bosonprotocol/react-kit": "^0.36.0-alpha.9",
"@bosonprotocol/roblox-sdk": "^1.0.0-alpha.14",
"@davatar/react": "^1.10.4",
"@ethersproject/address": "^5.6.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const StyledDropDown = styled(DropDown)<{ selected: boolean }>`
}
path {
stroke: ${({ selected }) => (selected ? colors.primary : colors.white)};
stroke: ${({ selected }) => (selected ? colors.green : colors.white)};
stroke-width: 2px;
}
`;
Expand Down
2 changes: 1 addition & 1 deletion src/components/detail/Detail.style.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ export const RaiseProblemButton = styled(Button)`
padding: 0.75rem 1rem;
font-weight: 600;
color: ${colors.accent};
color: ${colors.violet};
cursor: pointer;
transition: all 150ms ease-in-out;
&:hover:not(:disabled) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ export const ExchangeDetailWidget: React.FC<ExchangeDetailWidgetProps> = ({
data-config-id={config.envConfig.configId}
data-account={address}
data-with-external-signer="true"
withBosonStyle
style={{ width: "100%" }}
>
<span>Redeem</span>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export default function DisputesTable({ disputes }: Props) {
{emailAddress && (
<BosonButton
type="button"
variant="accentInvertedNoBorder"
variant="accentInverted"
size="small"
style={{
whiteSpace: "pre"
Expand Down
2 changes: 1 addition & 1 deletion src/components/error/SimpleError.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function SimpleError({
padding="1.5rem"
{...rest}
>
<Warning color={colors.darkOrange} size={16} />
<Warning color={colors.orangeDark} size={16} />
{children ? (
children
) : (
Expand Down
1 change: 1 addition & 0 deletions src/components/exchange/Exchange.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ export default function Exchange({
<ExchangeCardWrapper $isCustomStoreFront={!!isCustomStoreFront}>
<ExchangeCard
onCardClick={handleOnCardClick}
isConnected={!!address}
dataCard="exchange-card"
id={offer.id}
title={offer.metadata?.name || ""}
Expand Down
2 changes: 1 addition & 1 deletion src/components/footer/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const NavigationLinks = styled.nav<INavigationLinks>`
color: var(--footerTextColor);
}
a:hover {
color: ${colors.accent};
color: ${colors.violet};
}
${breakpoint.xs} {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const TableElementContainer = styled.tr`
position: relative;
&:after {
position: absolute;
background: ${colors.darkGreyTimeStamp};
background: ${colors.greyLight};
content: "";
left: 0;
bottom: 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const CardContainer = styled.div<{
$isUpperCardBgColorDefined: boolean;
}>`
position: relative;
background: ${colors.lightGrey2};
background: ${colors.greyLight};
display: flex;
cursor: pointer;
flex-direction: column;
Expand All @@ -40,7 +40,7 @@ const ImagesContainer = styled.div`
display: flex;
padding: 1rem;
gap: 1rem;
background: ${colors.lightGrey2};
background: ${colors.greyLight};
height: 13rem;
max-height: 13rem;
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ export default function TransactionSubmittedModal({
</Typography>
</a>

<StyledButton onClick={hideModal} withBosonStyle>
Close
</StyledButton>
<StyledButton onClick={hideModal}>Close</StyledButton>
</Grid>
);
}
2 changes: 1 addition & 1 deletion src/components/offer/ExchangeStatuses.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ const StatusToComponent = (
[exchanges.ExtendedExchangeState.NotRedeemableYet]: (
<Status
$color={colors.greyDark}
$background={colors.darkOrange}
$background={colors.orangeDark}
$size={size}
style={style}
className="status"
Expand Down
6 changes: 3 additions & 3 deletions src/components/seller/exchanges/SellerAction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export const SellerResolveDisputeButton = ({
if (!exchange || status !== "Resolving") {
return (
<BosonButton
variant="accentInvertedNoBorder"
variant="accentInverted"
size="small"
onClick={() => {
if (exchange?.id) {
Expand Down Expand Up @@ -107,7 +107,7 @@ export const SellerActionButton = ({
return (
<>
<BosonButton
variant="accentInvertedNoBorder"
variant="accentInverted"
size="small"
onClick={() => {
if (exchange?.id) {
Expand All @@ -119,7 +119,7 @@ export const SellerActionButton = ({
</BosonButton>
{status === subgraph.ExchangeState.COMMITTED && (
<StyledBosonButton
variant="accentInvertedNoBorder"
variant="accentInverted"
size="small"
disabled={!sellerRoles?.isAssistant}
tooltip="This action is restricted to only the assistant wallet"
Expand Down
6 changes: 2 additions & 4 deletions src/components/step/MultiSteps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default function MultiSteps({
<ArrowLeft
size={32}
style={{ cursor: active && callback ? "pointer" : "not-allowed" }}
color={active === 0 ? colors.lightArrowColor : colors.greyDark}
color={active === 0 ? colors.greyLight2 : colors.greyDark}
onClick={() => {
if (active && callback) {
callback(active - 1);
Expand Down Expand Up @@ -110,9 +110,7 @@ export default function MultiSteps({
<Grid alignItems="flex-end" width="auto">
<ArrowRight
size={32}
color={
isRightArrowEnabled ? colors.greyDark : colors.lightArrowColor
}
color={isRightArrowEnabled ? colors.greyDark : colors.greyLight2}
style={{ cursor: isRightArrowEnabled ? "pointer" : "not-allowed" }}
onClick={() => {
if (
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/BosonButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function BosonButton(props: IBosonButton) {
{/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */}
{/* @ts-ignore */}
<Wrapper {...wrapperParams}>
<StyledBosonButton {...restProps} disabled={disabled} withBosonStyle>
<StyledBosonButton {...restProps} disabled={disabled}>
<ChildWrapperButton data-child-wrapper-button>
{props.children}
</ChildWrapperButton>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/chat/components/ExchangeSidePreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ const getOfferDetailData = (
) : (
<Typography
tag="p"
color={colors.accent}
color={colors.violet}
fontSize={fontSizeExchangePolicy}
alignItems="center"
>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/chat/components/MessageSeparator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const Separator = styled.div`
z-index: ${zIndex.Default};
div:nth-of-type(1) {
width: max-content;
background-color: ${colors.darkGreyTimeStamp};
background-color: ${colors.greyLight};
padding: 0.25rem 1rem 0.25rem 1rem;
display: block;
margin: 0 auto;
Expand Down Expand Up @@ -42,7 +42,7 @@ const Separator = styled.div`
div:nth-of-type(2) {
width: calc(100% - 2.5rem);
height: 0.125rem;
background-color: ${colors.darkGreyTimeStamp};
background-color: ${colors.greyLight};
z-index: ${zIndex.Default};
position: relative;
margin-left: auto;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/common/OfferFullDescription.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const OfferFullDescription: React.FC<OfferFullDescriptionProps> = (
defaultCurrencyTicker: CONFIG.defaultCurrency.ticker,
licenseTemplate: CONFIG.rNFTLicenseTemplate,
minimumDisputeResolutionPeriodDays: CONFIG.minimumDisputePeriodInDays,
walletConnectProjectId: CONFIG.walletConnect.projectId,
// walletConnectProjectId: CONFIG.walletConnect.projectId,
ipfsProjectId: CONFIG.infuraProjectId,
ipfsProjectSecret: CONFIG.infuraProjectSecret,
contactSellerForExchangeUrl: "",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export const Congratulations: React.FC<CongratulationsProps> = ({
text="Provide funds in the seller pool for your offer to go live. Funds in the pool will apply to all your products."
cta={
<Button
themeVal="bosonPrimary"
themeVal="primary"
onClick={() => {
navigateTo({
pathname: getSellerCenterPath("Finances")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ export const CreateProductCongratulations: React.FC<
text="You must provide funds to cover your seller deposit. For multiple products you can do all at once."
cta={
<Button
themeVal="bosonPrimary"
themeVal="primary"
onClick={() => {
navigateTo({
pathname: getSellerCenterPath("Finances")
Expand Down
2 changes: 1 addition & 1 deletion src/pages/custom-store/styles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export const Section = styled.div`
line-height: 0.945rem;
text-transform: uppercase;
padding: 0.8125rem 0;
color: ${colors.grey3};
color: ${colors.greyLight4};
`;

export const FieldTitle = styled.div`
Expand Down
4 changes: 1 addition & 3 deletions src/pages/dispute-centre/RaiseDisputePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,7 @@ function RaiseDisputePage() {
<Grid alignItems="center" style={{ flex: "1 1 0" }}>
<ArrowLeft
size={32}
color={
currentStep === 0 ? colors.lightArrowColor : colors.greyDark
}
color={currentStep === 0 ? colors.greyLight2 : colors.greyDark}
onClick={() => {
goToViewMode(
ViewMode.DAPP,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/sell/landing/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Typography } from "../../../components/ui/Typography";
import { colors } from "../../../lib/styles/colors";

const StyledGrid = styled(Grid)`
background: ${colors.lightGrey2};
background: ${colors.greyLight};
padding: 1.5rem;
color: initial;
&:hover {
Expand Down

0 comments on commit 6946bd6

Please sign in to comment.