Skip to content
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

Jump to bottom

Fix crash when viewing a counterable offer #2177

Merged
merged 5 commits into from
Sep 27, 2023
Merged

Fix crash when viewing a counterable offer #2177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9c40650
Fix localization of "Days", "Hours", "Minutes" in Settings
paninaro Sep 27, 2023
b205a43
Remove drop shadow from the emoji picker in dark mode
paninaro Sep 27, 2023
b9388b8
Fix crash when viewing a counterable offer
paninaro Sep 27, 2023
552afae
Additionally removed some unsupported code
paninaro Sep 27, 2023
553cbc8
Remove unused canCounter prop
paninaro Sep 27, 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
4 changes: 3 additions & 1 deletion packages/core/src/screens/SelectKey/EmojiAndColorPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
15 changes: 3 additions & 12 deletions packages/gui/src/components/offers2/OfferBuilderExpirationSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import OfferBuilderExpirationCountdown from './OfferBuilderExpirationCountdown';

export type OfferExpirationSectionProps = {
isViewing: boolean;
canCounter: boolean;
currentTime: number;
expirationTime: number;
onSubmit: (values: SetExpirationData) => Promise<void>;
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -244,7 +236,6 @@ export default function OfferBuilderExpirationSection(props: OfferExpirationProp
return (
<Flex flexDirection="column" gap={3}>
{isViewing && viewSection()}
{isViewing && canCounter && editSection()}
{!isViewing && editSection()}
</Flex>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/gui/src/components/offers2/OfferBuilderViewer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -305,10 +301,9 @@ function OfferBuilderViewer(props: OfferBuilderViewerProps, ref: any) {
{hasExpiration && (
<OfferBuilderExpirationSection
isViewing
canCounter={canCounterOffer}
currentTime={currentTime}
expirationTime={expirationTime}
onSubmit={handleExpirationSubmit}
onSubmit={() => {}}
isGetHeightInfoLoading={isGetHeightInfoLoading}
isGetTimestampForHeightLoading={isGetTimestampForHeightLoading}
/>
Expand Down
12 changes: 6 additions & 6 deletions packages/gui/src/components/settings/SettingsExpiringOffers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
Expand Down
Loading