Skip to content

Commit

Permalink
Chore: QA Release
Browse files Browse the repository at this point in the history 
- wallet connect fixes
- android cards fix
Merge branch 'master' of github.com:GoodDollar/GoodProtocolUI into staging
  • Loading branch information
@L03TJ3
L03TJ3 committed Dec 7, 2023
2 parents 7f93367 + 48202ed commit 3ea4b18
Show file tree
Hide file tree
Showing 36 changed files with 884 additions and 186 deletions.
6 changes: 3 additions & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,10 @@
},
"dependencies": {
"@babel/runtime": "^7.18.9",
"@gooddollar/good-design": "^0.1.26",
"@gooddollar/good-design": "^0.1.28",
"@gooddollar/goodprotocol": "^2.0.22",
"@gooddollar/web3sdk": "^0.1.26",
"@gooddollar/web3sdk-v2": "^0.2.8",
"@gooddollar/web3sdk-v2": "^0.2.9",
"@headlessui/react": "1.5.0",
"@kimafinance/kima-transaction-widget": "^1.1.42-beta.1",
"@lingui/format-json": "^4.0.0",
Expand All @@ -224,7 +224,7 @@
"@web3-onboard/core": "^2.20.5",
"@web3-onboard/injected-wallets": "^2.10.1",
"@web3-onboard/react": "^2.8.10",
"@web3-onboard/walletconnect": "^2.4.7",
"@web3-onboard/walletconnect": "^2.5.1",
"@web3-onboard/walletlink": "^2.1.7",
"amplitude-js": "^8.21.2",
"dotenv": "^16.3.1",
Expand Down
4 changes: 1 addition & 3 deletions src/components/BlockNativeOnboard/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import useSendAnalyticsData from '../../hooks/useSendAnalyticsData'

import { connectOptions, torus } from 'connectors'
import { getNetworkEnv } from 'utils/env'
import { useSelectedChain } from 'state/application/hooks'

/**
* Just a button to trigger the onboard connect modal.
Expand Down Expand Up @@ -79,13 +78,12 @@ export const OnboardConnectButton: FC = () => {

// wrapper so we can pass the selected chain
export const OnboardProviderWrapper = ({ children }) => {
const { selectedChain } = useSelectedChain()
const network = getNetworkEnv()
return (
<OnboardProvider
options={connectOptions}
wallets={{ custom: [torus] }}
wc2Options={{ requiredChains: [selectedChain] }}
// wc2Options={{ requiredChains: [selectedChain] }} // advised not to use this option. ref: https://docs.walletconnect.com/advanced/migration-from-v1.x/namespaces#technical-implementation-guide-for-apps
gdEnv={network}
>
{children}
Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/af/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Koppel aan 'n beursie"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/ar/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "الاتصال بمحفظة"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/ca/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/cs/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/da/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/de/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,7 @@ msgstr "Herzliche Glückwünsche!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Verbinden Sie sich mit einer Brieftasche"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/el/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/en/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2794,7 +2794,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/es-AR/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2780,7 +2780,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Conectarse a una billetera"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/es/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,7 @@ msgstr "¡Felicidades!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Conectarse a una billetera"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/fi/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/fr/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,7 @@ msgstr "Toutes nos félicitations!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Connecter un portefeuille"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/he/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2794,7 +2794,7 @@ msgstr "מזל טוב!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "התחבר לארנק"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/hi/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "एक वॉलेट से कनेक्ट करें"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/hu/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/it/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2792,7 +2792,7 @@ msgstr "Congratulazioni!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Collega wallet"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/ja/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2782,7 +2782,7 @@ msgstr "おめでとう！"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "ウォレットに接続する"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/ko/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2757,7 +2757,7 @@ msgstr "축하합니다!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "지갑에 연결"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/nl/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/no/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/pl/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/pt-BR/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Conecte a uma carteira"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/pt/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/ro/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,7 @@ msgstr "Felicitări!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Conectați-vă la un portofel"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/ru/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2802,7 +2802,7 @@ msgstr "Поздравляю!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Подключиться к кошельку"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/sr/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/sv/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/tr/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/uk/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2302,7 +2302,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/vi/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2798,7 +2798,7 @@ msgstr "Xin chúc mừng!"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "Kết nối với ví"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/zh-CN/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2777,7 +2777,7 @@ msgstr "祝贺！"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "连接钱包"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/zh-TW/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2781,7 +2781,7 @@ msgstr "祝賀！"
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr "連接錢包"

Expand Down
2 changes: 1 addition & 1 deletion src/language/locales/zh/catalog.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2270,7 +2270,7 @@ msgstr ""
msgid "Connect a wallet to see your portfolio"
msgstr ""

#: src/components/BlockNativeOnboard/index.tsx:35
#: src/components/BlockNativeOnboard/index.tsx:34
msgid "Connect to a wallet"
msgstr ""

Expand Down
Loading

0 comments on commit 3ea4b18

Please sign in to comment.