From 9c406502d2da86147d7b526878147236e53b670a Mon Sep 17 00:00:00 2001 From: Jeff Cruikshank Date: Wed, 27 Sep 2023 10:52:31 -0700 Subject: [PATCH 1/5] Fix localization of "Days", "Hours", "Minutes" in Settings --- .../components/settings/SettingsExpiringOffers.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/gui/src/components/settings/SettingsExpiringOffers.tsx b/packages/gui/src/components/settings/SettingsExpiringOffers.tsx index 2352008263..1c419d4387 100644 --- a/packages/gui/src/components/settings/SettingsExpiringOffers.tsx +++ b/packages/gui/src/components/settings/SettingsExpiringOffers.tsx @@ -10,12 +10,6 @@ import useOfferExpirationDefaultTime, { offerExpirationDefaultTimeDefaults, } from '../../hooks/useOfferExpirationDefaultTime'; -const fields = [ - { name: 'days', label: t`Days`, max: 365 }, - { name: 'hours', label: t`Hours`, max: 24 }, - { name: 'minutes', label: t`Minutes`, max: 60 }, -]; - export default function SettingsExpiringOffers(props) { const { offerExpirationDefaultTime, setOfferExpirationDefaultTime, isOfferExpirationDefaultTimeEnabled } = useOfferExpirationDefaultTime(); @@ -24,6 +18,12 @@ export default function SettingsExpiringOffers(props) { defaultValues: offerExpirationDefaultTime, }); + const fields = [ + { name: 'days', label: t`Days`, max: 365 }, + { name: 'hours', label: t`Hours`, max: 24 }, + { name: 'minutes', label: t`Minutes`, max: 60 }, + ]; + async function handleSubmit(valuesLocal: OfferExpirationDefaultTimeInput) { const newValues = { ...valuesLocal, enabled: true }; setOfferExpirationDefaultTime(newValues); From b205a4377289e9becde14e06d61a2f0c87bba17d Mon Sep 17 00:00:00 2001 From: Jeff Cruikshank Date: Wed, 27 Sep 2023 11:12:16 -0700 Subject: [PATCH 2/5] Remove drop shadow from the emoji picker in dark mode --- packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx b/packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx index 0bfa3006cd..283e70fb52 100644 --- a/packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx +++ b/packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx @@ -59,7 +59,9 @@ export default function EmojiAndColorPicker(props: EmojiAndColorPickerType) { const pickerStyle: any = { backgroundColor: isDark ? Color.Neutral[800] : Color.Neutral[50], border: `1px solid ${isDark ? theme.palette.border.dark : theme.palette.border.main}`, - boxShadow: `0px 6px 19px ${alpha(Color.Neutral[800], 0.28)}, 0px 27px 65px ${alpha(Color.Neutral[500], 0.39)}`, + boxShadow: isDark + ? 'none' + : `0px 6px 19px ${alpha(Color.Neutral[800], 0.28)}, 0px 27px 65px ${alpha(Color.Neutral[500], 0.39)}`, borderRadius: '8px', padding: '0px', position: 'absolute', From b9388b894f05d461dda937dd5fe55f697084b3a7 Mon Sep 17 00:00:00 2001 From: Jeff Cruikshank Date: Wed, 27 Sep 2023 11:22:08 -0700 Subject: [PATCH 3/5] Fix crash when viewing a counterable offer --- .../offers2/OfferBuilderExpirationSection.tsx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx b/packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx index 7c9add1658..0e2c79bb19 100644 --- a/packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx +++ b/packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx @@ -18,7 +18,6 @@ import OfferBuilderExpirationCountdown from './OfferBuilderExpirationCountdown'; export type OfferExpirationSectionProps = { isViewing: boolean; - canCounter: boolean; currentTime: number; expirationTime: number; onSubmit: (values: SetExpirationData) => Promise; @@ -51,18 +50,11 @@ function ViewTitle({ expirationValues, willExpirationBeEnabled }: any) { ); } -export default function OfferBuilderExpirationSection(props: OfferExpirationProps) { +export default function OfferBuilderExpirationSection(props: OfferExpirationSectionProps) { const theme = useTheme(); const navigate = useNavigate(); - const { - isViewing, - canCounter, - currentTime, - expirationTime, - onSubmit, - isGetHeightInfoLoading, - isGetTimestampForHeightLoading, - } = props; + const { isViewing, currentTime, expirationTime, onSubmit, isGetHeightInfoLoading, isGetTimestampForHeightLoading } = + props; const { offerExpirationDefaultTime, isOfferExpirationDefaultTimeEnabled } = useOfferExpirationDefaultTime(); const isWalletSynced = useIsWalletSynced(); @@ -244,7 +236,6 @@ export default function OfferBuilderExpirationSection(props: OfferExpirationProp return ( {isViewing && viewSection()} - {isViewing && canCounter && editSection()} {!isViewing && editSection()} ); From 552afae3e36ca6ae7548c16a1ade832e815bd065 Mon Sep 17 00:00:00 2001 From: Jeff Cruikshank Date: Wed, 27 Sep 2023 12:05:51 -0700 Subject: [PATCH 4/5] Additionally removed some unsupported code --- packages/gui/src/components/offers2/OfferBuilderViewer.tsx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/packages/gui/src/components/offers2/OfferBuilderViewer.tsx b/packages/gui/src/components/offers2/OfferBuilderViewer.tsx index 8c72d37eb7..a1132215c4 100644 --- a/packages/gui/src/components/offers2/OfferBuilderViewer.tsx +++ b/packages/gui/src/components/offers2/OfferBuilderViewer.tsx @@ -182,10 +182,6 @@ function OfferBuilderViewer(props: OfferBuilderViewerProps, ref: any) { const isLoading = isLoadingWallets || (!computedOfferBuilderData && !prepopulatedOfferBuilderData) || isOffersLoading; - const handleExpirationSubmit = (_data) => { - setExpirationTimeMax(data); - }; - async function handleSubmit(values: OfferBuilderData) { const { offered } = values; const { fee: offeredFee } = offered; @@ -308,7 +304,7 @@ function OfferBuilderViewer(props: OfferBuilderViewerProps, ref: any) { canCounter={canCounterOffer} currentTime={currentTime} expirationTime={expirationTime} - onSubmit={handleExpirationSubmit} + onSubmit={() => {}} isGetHeightInfoLoading={isGetHeightInfoLoading} isGetTimestampForHeightLoading={isGetTimestampForHeightLoading} /> From 553cbc8a683536d8079cf16c127279713279ef0c Mon Sep 17 00:00:00 2001 From: Jeff Cruikshank Date: Wed, 27 Sep 2023 12:21:56 -0700 Subject: [PATCH 5/5] Remove unused canCounter prop --- packages/gui/src/components/offers2/OfferBuilderViewer.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/gui/src/components/offers2/OfferBuilderViewer.tsx b/packages/gui/src/components/offers2/OfferBuilderViewer.tsx index a1132215c4..7ad6887da0 100644 --- a/packages/gui/src/components/offers2/OfferBuilderViewer.tsx +++ b/packages/gui/src/components/offers2/OfferBuilderViewer.tsx @@ -301,7 +301,6 @@ function OfferBuilderViewer(props: OfferBuilderViewerProps, ref: any) { {hasExpiration && ( {}}