Merge commit '30f926b347697e96737493db0174b7bdfe6fb440' into 506-repl…

…ace-tokenicon-with-tokenavatar-using-avatar
bloomwalletio · Sep 4, 2023 · bc60fd0 · bc60fd0
2 parents a739e30 + 30f926b
commit bc60fd0
Show file tree

Hide file tree

Showing 48 changed files with 9,788 additions and 4,881 deletions.
diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
@@ -2,8 +2,8 @@ name: Crowdin
 
 on:
   schedule:
-    # Daily at 18:00 UTC
-    - cron: '0 18 * * *'
+    # Weekly on Wednesday at 18:00 UTC
+    - cron: '0 18 * * WED'
   workflow_dispatch:
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Sync translations from Crowdin
         uses: crowdin/[email protected]

diff --git a/crowdin.yml b/crowdin.yml
@@ -4,4 +4,4 @@ files:
   - source: /packages/shared/src/locales/en.json
     translation: /packages/shared/src/locales/%two_letters_code%.json
     dest: /packages/shared/src/locales/en.json
-preserve_hierarchy: 1
+preserve_hierarchy: true
diff --git a/packages/desktop/lib/electron/utils/ledger.utils.ts b/packages/desktop/lib/electron/utils/ledger.utils.ts
@@ -1,9 +1,11 @@
-import { IEvmTransactionSignature } from '@core/layer-2/interfaces'
-import { HEX_PREFIX } from '@core/utils'
 import AppEth from '@ledgerhq/hw-app-eth'
 import TransportNodeHid from '@ledgerhq/hw-transport-node-hid'
 import { listen } from '@ledgerhq/logs'
 
+// import specifity for core modules to prevent circular dependencies
+import { IEvmTransactionSignature } from '@core/layer-2/interfaces'
+import { HEX_PREFIX } from '@core/utils/constants'
+
 let transport: TransportNodeHid
 
 export async function openTransport(): Promise<void> {

diff --git a/packages/shared/src/locales/af.json b/packages/shared/src/locales/af.json
diff --git a/packages/shared/src/locales/ar.json b/packages/shared/src/locales/ar.json
diff --git a/packages/shared/src/locales/bg.json b/packages/shared/src/locales/bg.json
diff --git a/packages/shared/src/locales/ca.json b/packages/shared/src/locales/ca.json
diff --git a/packages/shared/src/locales/cs.json b/packages/shared/src/locales/cs.json
diff --git a/packages/shared/src/locales/da.json b/packages/shared/src/locales/da.json
diff --git a/packages/shared/src/locales/de.json b/packages/shared/src/locales/de.json
diff --git a/packages/shared/src/locales/el.json b/packages/shared/src/locales/el.json
diff --git a/packages/shared/src/locales/eo.json b/packages/shared/src/locales/eo.json
diff --git a/packages/shared/src/locales/es-ES.json b/packages/shared/src/locales/es-ES.json
diff --git a/packages/shared/src/locales/es-LA.json b/packages/shared/src/locales/es-LA.json
diff --git a/packages/shared/src/locales/et.json b/packages/shared/src/locales/et.json
diff --git a/packages/shared/src/locales/fa.json b/packages/shared/src/locales/fa.json
diff --git a/packages/shared/src/locales/fi.json b/packages/shared/src/locales/fi.json
diff --git a/packages/shared/src/locales/fr.json b/packages/shared/src/locales/fr.json
diff --git a/packages/shared/src/locales/he.json b/packages/shared/src/locales/he.json
diff --git a/packages/shared/src/locales/hi.json b/packages/shared/src/locales/hi.json
diff --git a/packages/shared/src/locales/hr.json b/packages/shared/src/locales/hr.json
diff --git a/packages/shared/src/locales/hu.json b/packages/shared/src/locales/hu.json
diff --git a/packages/shared/src/locales/id.json b/packages/shared/src/locales/id.json
diff --git a/packages/shared/src/locales/it.json b/packages/shared/src/locales/it.json
diff --git a/packages/shared/src/locales/ja.json b/packages/shared/src/locales/ja.json
diff --git a/packages/shared/src/locales/ko.json b/packages/shared/src/locales/ko.json
diff --git a/packages/shared/src/locales/ku.json b/packages/shared/src/locales/ku.json
diff --git a/packages/shared/src/locales/lv.json b/packages/shared/src/locales/lv.json
diff --git a/packages/shared/src/locales/mk.json b/packages/shared/src/locales/mk.json
diff --git a/packages/shared/src/locales/nl.json b/packages/shared/src/locales/nl.json
diff --git a/packages/shared/src/locales/no.json b/packages/shared/src/locales/no.json
diff --git a/packages/shared/src/locales/pl.json b/packages/shared/src/locales/pl.json
diff --git a/packages/shared/src/locales/pt-BR.json b/packages/shared/src/locales/pt-BR.json
diff --git a/packages/shared/src/locales/pt-PT.json b/packages/shared/src/locales/pt-PT.json
diff --git a/packages/shared/src/locales/ro.json b/packages/shared/src/locales/ro.json
diff --git a/packages/shared/src/locales/ru.json b/packages/shared/src/locales/ru.json
diff --git a/packages/shared/src/locales/si.json b/packages/shared/src/locales/si.json
diff --git a/packages/shared/src/locales/sk.json b/packages/shared/src/locales/sk.json
diff --git a/packages/shared/src/locales/sl.json b/packages/shared/src/locales/sl.json
diff --git a/packages/shared/src/locales/sq.json b/packages/shared/src/locales/sq.json
diff --git a/packages/shared/src/locales/sr.json b/packages/shared/src/locales/sr.json
diff --git a/packages/shared/src/locales/sv.json b/packages/shared/src/locales/sv.json
diff --git a/packages/shared/src/locales/tr.json b/packages/shared/src/locales/tr.json
diff --git a/packages/shared/src/locales/uk.json b/packages/shared/src/locales/uk.json
diff --git a/packages/shared/src/locales/ur.json b/packages/shared/src/locales/ur.json
diff --git a/packages/shared/src/locales/vi.json b/packages/shared/src/locales/vi.json
diff --git a/packages/shared/src/locales/zh-CN.json b/packages/shared/src/locales/zh-CN.json
diff --git a/packages/shared/src/locales/zh-TW.json b/packages/shared/src/locales/zh-TW.json