Merge branch 'dev' into fix/eip-712-validation

TalismanSociety · Jul 3, 2023 · 8932adc · 8932adc
2 parents 3c6dfca + 9bf810d
commit 8932adc
Show file tree

Hide file tree

Showing 213 changed files with 2,337 additions and 7,550 deletions.
diff --git a/.changeset/hip-mirrors-pump.md b/.changeset/hip-mirrors-pump.md
@@ -0,0 +1,5 @@
+---
+"talisman-ui": patch
+---
+
+fix: styles for multiline subtitles on CtaButton
diff --git a/README.md b/README.md
@@ -62,8 +62,8 @@ import { useTranslation } from "react-i18next"
 // uses the `common` namespace (`apps/extension/public/locales/en/common.json`)
 const { t } = useTranslation()
 
-// uses the `portfolio` namespace (`apps/extension/public/locales/en/portfolio.json`)
-const { t } = useTranslation("portfolio")
+// uses the `admin` namespace (`apps/extension/public/locales/en/admin.json`)
+const { t } = useTranslation("admin")
 ```
 
 3. Wrap any user-visible language in your component with the `t` function:

diff --git a/apps/extension/package.json b/apps/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "extension",
-  "version": "1.17.1",
+  "version": "1.17.3",
   "private": true,
   "license": "GPL-3.0-or-later",
   "dependencies": {

diff --git a/apps/extension/public/locales/cn/account-add.json b/apps/extension/public/locales/cn/account-add.json
diff --git a/apps/extension/public/locales/cn/asset.json b/apps/extension/public/locales/cn/asset.json
diff --git a/apps/extension/public/locales/cn/common.json b/apps/extension/public/locales/cn/common.json
diff --git a/apps/extension/public/locales/cn/copy-address.json b/apps/extension/public/locales/cn/copy-address.json
diff --git a/apps/extension/public/locales/cn/navigation.json b/apps/extension/public/locales/cn/navigation.json
diff --git a/apps/extension/public/locales/cn/onboard.json b/apps/extension/public/locales/cn/onboard.json
diff --git a/apps/extension/public/locales/cn/phishing.json b/apps/extension/public/locales/cn/phishing.json