Skip to content

feat: mvfw 2023 #617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
albertfolch-redeemeum merged 15 commits into from
May 11, 2023
Merged

feat: mvfw 2023 #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9436fd5
chore: add sellers 184,190,191 in curation list
levalleux-ludo Mar 3, 2023
f3120c7
chore: add seller id 195 in curation list
levalleux-ludo Mar 16, 2023
299de6b
add seller id 196 in curation list
levalleux-ludo Mar 16, 2023
63d294c
chore: upgrade to react-kit 0.16.2-alpha.16
levalleux-ludo Mar 23, 2023
dcfd26d
Merge branch 'to-be-merged'
levalleux-ludo Mar 23, 2023
d9e0bcc
chore: add seller 202 in curation list (#574)
levalleux-ludo Mar 27, 2023
8e36500
chore: add seller 197 in seller curation list (#576)
albertfolch-redeemeum Mar 28, 2023
aa719fc
fix: custom fonts (#579)
albertfolch-redeemeum Apr 5, 2023
eeec6b8
feat: add neuropolitical custom font (#587)
albertfolch-redeemeum Apr 11, 2023
518bfda
chore: add seller 207 in seller curation list (#591)
albertfolch-redeemeum Apr 12, 2023
a0b328e
fix: tabnapping protection (#594)
levalleux-ludo Apr 21, 2023
352414b
feat: change seller deposit copy (#603)
albertfolch-redeemeum Apr 25, 2023
73e2b69
feat: remove promotional banner (#601) (#604)
albertfolch-redeemeum Apr 25, 2023
ec355d2
feat: relist offer (#596) (#606)
albertfolch-redeemeum Apr 27, 2023
09e1b49
Merge branch 'main' into mvfw-2023
May 11, 2023
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: 1 addition & 1 deletion src/components/product/TermsOfExchange.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ export default function TermsOfExchange() {
<FormField
title="Seller deposit"
required
subTitle="The seller deposit is charged when a buyers commits to the offer and is used to hold the seller accountable to follow through with their commitment to deliver the physical item. If you break your commitment as a seller, then your deposit will be transferred to the buyer."
subTitle="The seller deposit is charged when a buyer commits to the offer and is used to hold the seller accountable to follow through with their commitment to deliver the physical item. If you break your commitment as a seller, then your deposit will be transferred to the buyer. A deposit value is required to be set below, but it is up to you as the seller to choose the value or set it to 0."
>
<FieldContainer>
<div>
Expand Down
3 changes: 2 additions & 1 deletion src/components/seller/products/SellerProductsTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,8 @@ export default function SellerProductsTable({
padding: "0.25rem 1rem",
margin: "1px"
}}
disabled={!offer}
tooltip="This action is restricted to only the assistant wallet"
disabled={!offer || !sellerRoles?.isAssistant}
onClick={async (
event: Parameters<
NonNullable<Parameters<typeof Button>[0]["onClick"]>
Expand Down