Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 7 additions & 6 deletions src/pages/reward-page/reward-address-list-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ import {
deleteRewardAddress,
getRewardAddressList,
} from '../../apis/reward';
import { useRewardPurchaseStore } from '../../store/rewardPurchaseStore';

export default function RewardAddressListPage() {
const navigate = useNavigate();
const [selectedAddressId, setSelectedAddressId] = useState<number | null>(null);
const { selectedShippingAddressId, setSelectedShippingAddressId } = useRewardPurchaseStore();
const [deleteAddressId, setDeleteAddressId] = useState<number | null>(null);
const {
data: addressList,
Expand All @@ -26,7 +27,7 @@ export default function RewardAddressListPage() {

const shippingAddresses = addressList ?? [];
const effectiveSelectedAddressId =
selectedAddressId ??
selectedShippingAddressId ??
shippingAddresses.find(({ isDefault }) => isDefault)?.shippingAddressId ??
shippingAddresses[0]?.shippingAddressId ??
null;
Expand All @@ -36,9 +37,9 @@ export default function RewardAddressListPage() {
const deleteAddressMutation = useMutation({
mutationFn: deleteRewardAddress,
onSuccess: (_, deletedAddressId) => {
setSelectedAddressId((currentAddressId) =>
currentAddressId === deletedAddressId ? null : currentAddressId,
);
if (selectedShippingAddressId === deletedAddressId) {
setSelectedShippingAddressId(null);
};
queryClient.invalidateQueries({ queryKey: ['rewardAddressList'] });
},
onError: () => {
Expand Down Expand Up @@ -87,7 +88,7 @@ export default function RewardAddressListPage() {
key={shippingAddress.shippingAddressId}
shippingAddressListResponse={shippingAddress}
isSelected={effectiveSelectedAddressId === shippingAddress.shippingAddressId}
onSelect={() => setSelectedAddressId(shippingAddress.shippingAddressId)}
onSelect={() => setSelectedShippingAddressId(shippingAddress.shippingAddressId)}
onEdit={() => navigate(`/reward/address-detail/${shippingAddress.shippingAddressId}/edit`)}
onDelete={() => setDeleteAddressId(shippingAddress.shippingAddressId)}
/>
Expand Down
6 changes: 5 additions & 1 deletion src/pages/reward-page/reward-purchase-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {
import LoadingSpinner from '../../components/common/LoadingSpinner';
import FailInfo from '../../components/common/FailInfo';
import Modal from '../../components/common/Modal';
import { useRewardPurchaseStore } from '../../store/rewardPurchaseStore';

interface PurchaseSectionProps {
product: RewardProductDetail;
Expand Down Expand Up @@ -91,6 +92,7 @@ function GifticonPurchaseSection({
}

export default function RewardCheckoutPage() {
const { selectedShippingAddressId} = useRewardPurchaseStore();
const [receiverName, setReceiverName] = useState('');
const [receiverPhone, setReceiverPhone] = useState('');
const [isInsufficientPointModalOpen, setIsInsufficientPointModalOpen] =
Expand Down Expand Up @@ -131,7 +133,9 @@ export default function RewardCheckoutPage() {
enabled: isPartnerProduct,
});
const selectedShippingAddress =
addressList?.find(({ isDefault }) => isDefault) ?? addressList?.[0] ?? null;
addressList?.find(
({ shippingAddressId }) => shippingAddressId === selectedShippingAddressId,
) ?? addressList?.find(({ isDefault }) => isDefault) ?? addressList?.[0] ?? null;
const {
mutate: purchaseReward,
isPending: isPurchasing,
Expand Down
11 changes: 11 additions & 0 deletions src/store/rewardPurchaseStore.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import {create} from "zustand";

interface RewardPurchaseState {
selectedShippingAddressId: number | null;
setSelectedShippingAddressId: (id: number | null) => void;
}

export const useRewardPurchaseStore = create<RewardPurchaseState>((set) => ({
selectedShippingAddressId: null,
setSelectedShippingAddressId: (id) => set({selectedShippingAddressId: id}),
}));
Loading