From d0bcdde4c894e381e6d86f96669006b9f562d8f1 Mon Sep 17 00:00:00 2001 From: Emil Nielsen Date: Sat, 22 Apr 2023 08:25:06 +0700 Subject: [PATCH] Small tweaks --- sql/procedures.sql | 2 +- src/app/Components/Accounts/Account.tsx | 11 ++++++++--- src/app/Components/Accounts/AccountsView.tsx | 9 ++------- src/app/page.tsx | 11 +++++++++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/sql/procedures.sql b/sql/procedures.sql index 59ef9de..68a205e 100644 --- a/sql/procedures.sql +++ b/sql/procedures.sql @@ -105,7 +105,7 @@ begin update bank_account set balance = balance + resource_amount / resource_sell_factor where user_id = p_user_id - returning resource_amount * resource_sell_factor into return_amount; + returning resource_amount / resource_sell_factor into return_amount; sale_result := 'Success'; end if; diff --git a/src/app/Components/Accounts/Account.tsx b/src/app/Components/Accounts/Account.tsx index 38b56b8..b410d5d 100644 --- a/src/app/Components/Accounts/Account.tsx +++ b/src/app/Components/Accounts/Account.tsx @@ -13,13 +13,13 @@ const ResourceAccount = (props: { const [conversionPair, setConversionPair] = useState< IConversionPair | undefined >(undefined); - const [conversionRate, setConversionRate] = useState(0.1); + const [conversionRate, setConversionRate] = useState(0); const handleConversionPair = (amount: number, resourceType: string) => { const updatedPair = { resourceType: resourceType, resourceAmount: amount, - moneyAmount: amount * conversionRate, + moneyAmount: amount / conversionRate, }; setConversionPair(updatedPair); }; @@ -31,6 +31,11 @@ const ResourceAccount = (props: { return rate; }; + const handleSellResource = () => { + conversionPair && props.sellResource([conversionPair]); + setShowModal(false); + }; + useEffect(() => { const rate = getConversionRate(props.account); setConversionRate(rate); @@ -84,7 +89,7 @@ const ResourceAccount = (props: {

{conversionPair && (