Merge branch 'main' into feat/burn-nft-ui

TERITORI · May 30, 2024 · 904e349 · 904e349
2 parents 0a1aaea + 9188562
commit 904e349
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 33 deletions.
diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 18
+          node-version-file: ".nvmrc"
 
       - uses: actions/setup-go@v3
         with:
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: "npm"
-          node-version: 18
+          node-version-file: ".nvmrc"
 
       - uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/gen.yml b/.github/workflows/gen.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 18
+          node-version-file: ".nvmrc"
 
       - uses: actions/setup-go@v3
         with:

diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 18
+          node-version-file: ".nvmrc"
 
       - name: Install node modules
         run: yarn

diff --git a/.github/workflows/mobile-build-android.yml b/.github/workflows/mobile-build-android.yml
@@ -36,7 +36,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 18
+          node-version-file: ".nvmrc"
 
       - uses: actions/setup-java@v4
         with:

diff --git a/.github/workflows/mobile-build-ios.yml b/.github/workflows/mobile-build-ios.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/setup-node@v3
         with:
           cache: "yarn"
-          node-version: 18
+          node-version-file: ".nvmrc"
 
       - name: Fix package.json
         run: yarn remove @lottiefiles/react-lottie-player

diff --git a/package.json b/package.json
@@ -82,7 +82,7 @@
     "electron-store": "^8.1.0",
     "eslint-config-universe": "^12.0.0",
     "ethers": "^5.7.2",
-    "expo": "~50.0.17",
+    "expo": "~50.0.19",
     "expo-av": "~13.10.6",
     "expo-blur": "~12.9.2",
     "expo-clipboard": "~5.0.1",
@@ -192,7 +192,7 @@
     "electron": "^27.1.2",
     "eslint": "^8.52.0",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "expo-dev-client": "~3.3.11",
+    "expo-dev-client": "~3.3.12",
     "expo-doctor": "^1.1.3",
     "patch-package": "^7.0.2",
     "postinstall-postinstall": "^2.1.0",

diff --git a/yarn.lock b/yarn.lock
@@ -3728,9 +3728,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/cli@npm:0.17.10":
-  version: 0.17.10
-  resolution: "@expo/cli@npm:0.17.10"
+"@expo/cli@npm:0.17.12":
+  version: 0.17.12
+  resolution: "@expo/cli@npm:0.17.12"
   dependencies:
     "@babel/runtime": ^7.20.0
     "@expo/code-signing-certificates": 0.0.5
@@ -3810,7 +3810,7 @@ __metadata:
     ws: ^8.12.1
   bin:
     expo-internal: build/bin/cli
-  checksum: acd3fd40dc9c6da2755463aca1ab085e01b28ca9efe824f90f75b80765f15ce6023e506232fab4e453b8a43131a0233e2db38869caa2cd7ca2d9e2980d0d9662
+  checksum: cd49b7efad4a7e54a1eed90c30253605c779acecf19c7b88f23a8d856a15ae0c7e778df4c3e8d1657f560baca9292d0f83379d1e155cf76432e445a5112cc639
   languageName: node
   linkType: hard
 
@@ -3824,9 +3824,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@expo/config-plugins@npm:7.9.1, @expo/config-plugins@npm:~7.9.0":
-  version: 7.9.1
-  resolution: "@expo/config-plugins@npm:7.9.1"
+"@expo/config-plugins@npm:7.9.2":
+  version: 7.9.2
+  resolution: "@expo/config-plugins@npm:7.9.2"
   dependencies:
     "@expo/config-types": ^50.0.0-alpha.1
     "@expo/fingerprint": ^0.6.0
@@ -3845,7 +3845,7 @@ __metadata:
     slugify: ^1.6.6
     xcode: ^3.0.1
     xml2js: 0.6.0
-  checksum: b685c76a9f01af779494058f5206f7663888fa47191217a1ead24f4bd56315dab5c0865e920e7141f2fd1bf1872c3b973c9987a90c6c02156c1a9e78a2b673e7
+  checksum: cd3440558a6cb757626a21a945781bd1d43ed1b4ab268673c29a8eb2f6ed95217bf8a94b6093a0238c3ce6481c8c963598aab6334e10f72a594ce8d5b9f87505
   languageName: node
   linkType: hard
 
@@ -3874,6 +3874,31 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@expo/config-plugins@npm:~7.9.0":
+  version: 7.9.1
+  resolution: "@expo/config-plugins@npm:7.9.1"
+  dependencies:
+    "@expo/config-types": ^50.0.0-alpha.1
+    "@expo/fingerprint": ^0.6.0
+    "@expo/json-file": ~8.3.0
+    "@expo/plist": ^0.1.0
+    "@expo/sdk-runtime-versions": ^1.0.0
+    "@react-native/normalize-color": ^2.0.0
+    chalk: ^4.1.2
+    debug: ^4.3.1
+    find-up: ~5.0.0
+    getenv: ^1.0.0
+    glob: 7.1.6
+    resolve-from: ^5.0.0
+    semver: ^7.5.3
+    slash: ^3.0.0
+    slugify: ^1.6.6
+    xcode: ^3.0.1
+    xml2js: 0.6.0
+  checksum: b685c76a9f01af779494058f5206f7663888fa47191217a1ead24f4bd56315dab5c0865e920e7141f2fd1bf1872c3b973c9987a90c6c02156c1a9e78a2b673e7
+  languageName: node
+  linkType: hard
+
 "@expo/config-types@npm:^50.0.0, @expo/config-types@npm:^50.0.0-alpha.1":
   version: 50.0.0
   resolution: "@expo/config-types@npm:50.0.0"
@@ -11065,24 +11090,24 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo-dev-client@npm:~3.3.11":
-  version: 3.3.11
-  resolution: "expo-dev-client@npm:3.3.11"
+"expo-dev-client@npm:~3.3.12":
+  version: 3.3.12
+  resolution: "expo-dev-client@npm:3.3.12"
   dependencies:
-    expo-dev-launcher: 3.6.9
+    expo-dev-launcher: 3.6.10
     expo-dev-menu: 4.5.8
     expo-dev-menu-interface: 1.7.2
     expo-manifests: ~0.13.0
     expo-updates-interface: ~0.15.1
   peerDependencies:
     expo: "*"
-  checksum: 1b949922f32ffb9085dee06bc9c5613c1fb27e2a3dadfd06581aa5b52ced82e7c0366a2bf656e9373866f33bd9f9e62a7e5473fb2bed455067fea393e6a9e97e
+  checksum: d08bf20c6e05cd7ab5ad5e055865e1829e8c8a7c383dd07a6042857da77487baeb8b28874b184c87f74fb3e55445f5545a604bcef34e2f7de2717e7d215d585b
   languageName: node
   linkType: hard
 
-"expo-dev-launcher@npm:3.6.9":
-  version: 3.6.9
-  resolution: "expo-dev-launcher@npm:3.6.9"
+"expo-dev-launcher@npm:3.6.10":
+  version: 3.6.10
+  resolution: "expo-dev-launcher@npm:3.6.10"
   dependencies:
     ajv: 8.11.0
     expo-dev-menu: 4.5.8
@@ -11091,7 +11116,7 @@ __metadata:
     semver: ^7.5.3
   peerDependencies:
     expo: "*"
-  checksum: fd4e9417a0dd950834cbcbfc018102281b052cfbff38c76570c3be56c8fbfc36ebb072cfe8568e57ae3b8f72c21311d430197f52d76db6225142da8ce5532825
+  checksum: 68e347e495aedda2d97722b39864465114cd042f483916e4bb497f6c0c0cc4ba0293ddec80b55f6838d84db7e8521bd943b45aee47f03e3825e661323e6ea8d2
   languageName: node
   linkType: hard
 
@@ -11299,14 +11324,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"expo@npm:~50.0.17":
-  version: 50.0.17
-  resolution: "expo@npm:50.0.17"
+"expo@npm:~50.0.19":
+  version: 50.0.19
+  resolution: "expo@npm:50.0.19"
   dependencies:
     "@babel/runtime": ^7.20.0
-    "@expo/cli": 0.17.10
+    "@expo/cli": 0.17.12
     "@expo/config": 8.5.6
-    "@expo/config-plugins": 7.9.1
+    "@expo/config-plugins": 7.9.2
     "@expo/metro-config": 0.17.7
     "@expo/vector-icons": ^14.0.0
     babel-preset-expo: ~10.0.2
@@ -11320,7 +11345,7 @@ __metadata:
     whatwg-url-without-unicode: 8.0.0-3
   bin:
     expo: bin/cli
-  checksum: a41254c18b86bb012e8e6152f0d8aa4a92d1b209209bdd9f672f82e1bdc65546a3c4bfee22f82185ad01811427873a1b6574208f38a64063cb6a9ad2f74127af
+  checksum: f5b914e07899c41f673783ea313afa0a88fe41afae1712ee8d5cf78a7f94c4563401503f85e9f29b1e9b9c1efcd786620e41d2575f2ffe348988e4cb98418ae5
   languageName: node
   linkType: hard
 
@@ -19366,11 +19391,11 @@ __metadata:
     eslint-config-universe: ^12.0.0
     eslint-plugin-react-hooks: ^4.6.0
     ethers: ^5.7.2
-    expo: ~50.0.17
+    expo: ~50.0.19
     expo-av: ~13.10.6
     expo-blur: ~12.9.2
     expo-clipboard: ~5.0.1
-    expo-dev-client: ~3.3.11
+    expo-dev-client: ~3.3.12
     expo-doctor: ^1.1.3
     expo-document-picker: ~11.10.1
     expo-file-system: ~16.0.9