Skip to content
Open
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
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,8 @@ deploy.sh
yalc.lock
.continueignore
analice.html
e2e.log
e2e.logTEST_SAVINGS_INTEGRATION.html
TEST_SAVINGS_INTEGRATION.html
SAVINGS_INTEGRATION_TEST.html
catalog.po
src/language/locales/sr/catalog.po
2 changes: 1 addition & 1 deletion src/components/Faq/Faq.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import MarkDown from '@ronradtke/react-native-markdown-display'

import { faqs } from './copies'

export type FaqType = 'swap' | 'buy' | 'bridge' | 'goodid' | 'claim' | 'reserve'
export type FaqType = 'swap' | 'buy' | 'bridge' | 'goodid' | 'claim' | 'reserve' | 'savings'

const FaqItem = ({ id, question, answer, links, AltLink }) => {
const { isDesktopView } = useScreenSize()
Expand Down
41 changes: 41 additions & 0 deletions src/components/Faq/copies.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,52 @@ const faqReserveCopy: FaqItemCopy[] = [
},
]

const faqSavingsCopy: FaqItemCopy[] = [
{
id: 'whatissavings',
question: `What is Savings?`,
answer: `Savings is a way to earn rewards by lending or staking your GoodDollars. You can lock your digital assets and generate passive income over time through yield-bearing products.`,
},
{
id: 'howsavingswork',
question: `How does Savings work?`,
answer: `When you use the Savings product, your assets are deposited into a yield-generating protocol. Your funds work for you by earning rewards, which are added to your balance periodically. The exact mechanism depends on the underlying savings product.`,
},
{
id: 'savingrisk',
question: `What are the risks of using Savings?`,
answer: `Savings products carry smart contract risk and market risk. Please review the terms and risks of the specific savings protocol before depositing. Your funds are subject to the security of the underlying smart contracts.`,
},
{
id: 'withdrawsavings',
question: `Can I withdraw my funds anytime?`,
answer: `Withdrawal terms depend on the specific savings product. Some products may have lock-up periods or redemption schedules. Check the product details for specific terms before depositing.`,
},
{
id: 'savingyield',
question: `How is my yield calculated?`,
answer: `Yield is calculated based on the APY (Annual Percentage Yield) advertised by the savings product. Your actual returns depend on the amount deposited, duration, and any applicable fees or terms.`,
},
{
id: 'savingsfees',
question: `Are there fees for using Savings?`,
answer: `Fees may apply depending on the specific savings product. You can review the fee structure and APY details of each product before making a deposit. GoodDapp may not charge additional fees on top of protocol fees.`,
links: [
{
href: 'https://docs.gooddollar.org/savings',
text: 'To learn more about Savings products, visit the',
linkText: 'GoodDollar Documentation',
},
],
},
]

export const faqs = {
swap: faqSwapCopy,
buy: faqBuyCopy,
bridge: faqBridgeCopy,
goodid: faqGoodIDCopy,
claim: faqClaimCopy,
reserve: faqReserveCopy,
savings: faqSavingsCopy,
}
5 changes: 5 additions & 0 deletions src/components/SideBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,11 @@ export default function SideBar({ mobile, closeSidebar }: { mobile?: boolean; cl
text: 'Claim',
show: true,
},
{
route: '/savings',
text: 'Savings',
show: true,
},
{
route: '/news',
text: 'News',
Expand Down
3 changes: 2 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,10 @@ const enableServiceWorker =
const ProviderWrapper = ({ children }) => (
<Provider store={store}>
<PostHogProvider
apiKey={import.meta.env.REACT_APP_POSTHOG_KEY}
apiKey={import.meta.env.REACT_APP_POSTHOG_KEY || 'disabled'}
options={{
host: import.meta.env.REACT_APP_POSTHOG_PROXY ?? 'https://app.posthog.com',
...(import.meta.env.REACT_APP_POSTHOG_KEY ? {} : { disabled: true }),
}}
autocapture={false}
>
Expand Down
20 changes: 14 additions & 6 deletions src/language/locales/af/catalog.po
Original file line number Diff line number Diff line change
Expand Up @@ -2954,6 +2954,14 @@ msgstr ""
#~ msgid "Donate"
#~ msgstr ""

#: src/pages/gd/Savings/index.tsx:14
msgid ""
"Earn rewards by saving your GoodDollars with Ubeswap savings products!\n"
"Savings provides a simple way to generate yield on your digital assets.\n"
"Securely lock your assets and watch them grow over time.\n"
"Please be patient, loading information may take some time."
msgstr ""

#: src/components/Gas/index.tsx:12
msgid "failed to load"
msgstr "misluk om te laai"
Expand Down Expand Up @@ -3023,7 +3031,7 @@ msgstr ""
msgid "GoodDollar creates free money as a public good, G$ tokens, which you can collect daily."
msgstr ""

#: src/components/SideBar.tsx:230
#: src/components/SideBar.tsx:235
msgid "GoodDollar Main Bridge"
msgstr ""

Expand Down Expand Up @@ -3283,7 +3291,7 @@ msgstr "Glip Verdraagsaamheid"
msgid "Social APY"
msgstr ""

#: src/components/SideBar.tsx:237
#: src/components/SideBar.tsx:242
msgid "Squid Router"
msgstr ""

Expand Down Expand Up @@ -3536,11 +3544,11 @@ msgstr "Transaksie is gestuur na die blockchain"
msgid "TYPE"
msgstr ""

#: src/components/SideBar.tsx:206
#: src/components/SideBar.tsx:211
msgid "Uniswap (Celo)"
msgstr ""

#: src/components/SideBar.tsx:193
#: src/components/SideBar.tsx:198
msgid "Uniswap (widget)"
msgstr ""

Expand All @@ -3558,7 +3566,7 @@ msgstr "Kyk op verkenner"
#~ msgid "View transaction on explorer"
#~ msgstr ""

#: src/components/SideBar.tsx:199
#: src/components/SideBar.tsx:204
msgid "Voltage Finance (Fuse)"
msgstr ""

Expand Down Expand Up @@ -3641,7 +3649,7 @@ msgstr ""
msgid "Withdrew funds from {0}"
msgstr ""

#: src/components/SideBar.tsx:213
#: src/components/SideBar.tsx:218
msgid "Xswap (XDC)"
msgstr ""

Expand Down
20 changes: 14 additions & 6 deletions src/language/locales/ar/catalog.po
Original file line number Diff line number Diff line change
Expand Up @@ -2954,6 +2954,14 @@ msgstr ""
#~ msgid "Donate"
#~ msgstr ""

#: src/pages/gd/Savings/index.tsx:14
msgid ""
"Earn rewards by saving your GoodDollars with Ubeswap savings products!\n"
"Savings provides a simple way to generate yield on your digital assets.\n"
"Securely lock your assets and watch them grow over time.\n"
"Please be patient, loading information may take some time."
msgstr ""

#: src/components/Gas/index.tsx:12
msgid "failed to load"
msgstr "فشل التحميل"
Expand Down Expand Up @@ -3023,7 +3031,7 @@ msgstr ""
msgid "GoodDollar creates free money as a public good, G$ tokens, which you can collect daily."
msgstr ""

#: src/components/SideBar.tsx:230
#: src/components/SideBar.tsx:235
msgid "GoodDollar Main Bridge"
msgstr ""

Expand Down Expand Up @@ -3283,7 +3291,7 @@ msgstr "تسامح الانزلاق"
msgid "Social APY"
msgstr ""

#: src/components/SideBar.tsx:237
#: src/components/SideBar.tsx:242
msgid "Squid Router"
msgstr ""

Expand Down Expand Up @@ -3536,11 +3544,11 @@ msgstr "تم إرسال المعاملة إلى blockchain"
msgid "TYPE"
msgstr ""

#: src/components/SideBar.tsx:206
#: src/components/SideBar.tsx:211
msgid "Uniswap (Celo)"
msgstr ""

#: src/components/SideBar.tsx:193
#: src/components/SideBar.tsx:198
msgid "Uniswap (widget)"
msgstr ""

Expand All @@ -3558,7 +3566,7 @@ msgstr "عرض على المستكشف"
#~ msgid "View transaction on explorer"
#~ msgstr ""

#: src/components/SideBar.tsx:199
#: src/components/SideBar.tsx:204
msgid "Voltage Finance (Fuse)"
msgstr ""

Expand Down Expand Up @@ -3641,7 +3649,7 @@ msgstr ""
msgid "Withdrew funds from {0}"
msgstr ""

#: src/components/SideBar.tsx:213
#: src/components/SideBar.tsx:218
msgid "Xswap (XDC)"
msgstr ""

Expand Down
20 changes: 14 additions & 6 deletions src/language/locales/ca/catalog.po
Original file line number Diff line number Diff line change
Expand Up @@ -2954,6 +2954,14 @@ msgstr ""
#~ msgid "Donate"
#~ msgstr ""

#: src/pages/gd/Savings/index.tsx:14
msgid ""
"Earn rewards by saving your GoodDollars with Ubeswap savings products!\n"
"Savings provides a simple way to generate yield on your digital assets.\n"
"Securely lock your assets and watch them grow over time.\n"
"Please be patient, loading information may take some time."
msgstr ""

#: src/components/Gas/index.tsx:12
msgid "failed to load"
msgstr ""
Expand Down Expand Up @@ -3023,7 +3031,7 @@ msgstr ""
msgid "GoodDollar creates free money as a public good, G$ tokens, which you can collect daily."
msgstr ""

#: src/components/SideBar.tsx:230
#: src/components/SideBar.tsx:235
msgid "GoodDollar Main Bridge"
msgstr ""

Expand Down Expand Up @@ -3283,7 +3291,7 @@ msgstr ""
msgid "Social APY"
msgstr ""

#: src/components/SideBar.tsx:237
#: src/components/SideBar.tsx:242
msgid "Squid Router"
msgstr ""

Expand Down Expand Up @@ -3536,11 +3544,11 @@ msgstr ""
msgid "TYPE"
msgstr ""

#: src/components/SideBar.tsx:206
#: src/components/SideBar.tsx:211
msgid "Uniswap (Celo)"
msgstr ""

#: src/components/SideBar.tsx:193
#: src/components/SideBar.tsx:198
msgid "Uniswap (widget)"
msgstr ""

Expand All @@ -3558,7 +3566,7 @@ msgstr ""
#~ msgid "View transaction on explorer"
#~ msgstr ""

#: src/components/SideBar.tsx:199
#: src/components/SideBar.tsx:204
msgid "Voltage Finance (Fuse)"
msgstr ""

Expand Down Expand Up @@ -3641,7 +3649,7 @@ msgstr ""
msgid "Withdrew funds from {0}"
msgstr ""

#: src/components/SideBar.tsx:213
#: src/components/SideBar.tsx:218
msgid "Xswap (XDC)"
msgstr ""

Expand Down
20 changes: 14 additions & 6 deletions src/language/locales/cs/catalog.po
Original file line number Diff line number Diff line change
Expand Up @@ -2954,6 +2954,14 @@ msgstr ""
#~ msgid "Donate"
#~ msgstr ""

#: src/pages/gd/Savings/index.tsx:14
msgid ""
"Earn rewards by saving your GoodDollars with Ubeswap savings products!\n"
"Savings provides a simple way to generate yield on your digital assets.\n"
"Securely lock your assets and watch them grow over time.\n"
"Please be patient, loading information may take some time."
msgstr ""

#: src/components/Gas/index.tsx:12
msgid "failed to load"
msgstr ""
Expand Down Expand Up @@ -3023,7 +3031,7 @@ msgstr ""
msgid "GoodDollar creates free money as a public good, G$ tokens, which you can collect daily."
msgstr ""

#: src/components/SideBar.tsx:230
#: src/components/SideBar.tsx:235
msgid "GoodDollar Main Bridge"
msgstr ""

Expand Down Expand Up @@ -3283,7 +3291,7 @@ msgstr ""
msgid "Social APY"
msgstr ""

#: src/components/SideBar.tsx:237
#: src/components/SideBar.tsx:242
msgid "Squid Router"
msgstr ""

Expand Down Expand Up @@ -3536,11 +3544,11 @@ msgstr ""
msgid "TYPE"
msgstr ""

#: src/components/SideBar.tsx:206
#: src/components/SideBar.tsx:211
msgid "Uniswap (Celo)"
msgstr ""

#: src/components/SideBar.tsx:193
#: src/components/SideBar.tsx:198
msgid "Uniswap (widget)"
msgstr ""

Expand All @@ -3558,7 +3566,7 @@ msgstr ""
#~ msgid "View transaction on explorer"
#~ msgstr ""

#: src/components/SideBar.tsx:199
#: src/components/SideBar.tsx:204
msgid "Voltage Finance (Fuse)"
msgstr ""

Expand Down Expand Up @@ -3641,7 +3649,7 @@ msgstr ""
msgid "Withdrew funds from {0}"
msgstr ""

#: src/components/SideBar.tsx:213
#: src/components/SideBar.tsx:218
msgid "Xswap (XDC)"
msgstr ""

Expand Down
Loading