Merge pull request #632 from Adamant-im/fix/vulns-and-other-things

Fix/vulns and other things
Adamant-im · Jun 10, 2024 · 7ad5d4b · 7ad5d4b
2 parents 5219a49 + 7706427
commit 7ad5d4b
Show file tree

Hide file tree

Showing 5 changed files with 706 additions and 267 deletions.
diff --git a/adamant-wallets b/adamant-wallets
diff --git a/build/osx/entitlements.mac.plist b/build/osx/entitlements.mac.plist
@@ -6,5 +6,7 @@
     <true/>
     <key>com.apple.security.device.camera</key>
     <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
   </dict>
 </plist>
diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -1,4 +1,4 @@
-import { CapacitorConfig } from '@capacitor/cli';
+import { CapacitorConfig } from '@capacitor/cli'
 
 const config: CapacitorConfig = {
   appId: 'im.adamant.adamantmessengerpwa',
@@ -9,9 +9,9 @@ const config: CapacitorConfig = {
   },
   plugins: {
     SplashScreen: {
-      androidScaleType: "CENTER_CROP", // fix logo stretching
+      androidScaleType: 'CENTER_CROP' // fix logo stretching
     }
   }
-};
+}
 
-export default config;
+export default config
+6 −0		CHANGELOG.md
+20 −1		assets/general/adamant/info.json
+7 −0		assets/general/bitcoin/info.json
+0 −9		assets/general/ethereum/info.json
+17 −26		assets/general/floki/images/icon.svg
+10 −25		assets/general/floki/images/icon.vue
+1 −1		package.json