Merge pull request #1 from spknetwork/master

Fix conflicts

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
         env:
           NODE_OPTIONS: --max_old_space_size=8096
 
-        uses: samuelmeuli/action-electron-builder@v1
+        uses: samuelmeuli/action-electron-builder@v1.6.0
         with:
           # GitHub token, automatically provided to the action
           # (No need to define this secret in the repo settings)

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build-main": "webpack --config webpack/main.config.js",
     "build-renderer": "webpack --config webpack/renderer.prod.config.js",
-    "build": "npx npm-run-all --parallel build-main build-renderer",
+    "build": "concurrently \"npm run build-main\"  \"npm run build-renderer\"",
     "clear": "rm -rf ./dist",
     "dev": "cross-env DEBUG=3speak:* NODE_OPTIONS='--max_old_space_size=8096' npm run start-renderer",
     "lint:fix": "eslint --fix \"src/**/*.{ts,tsx}\"",
@@ -37,6 +37,7 @@
     "@types/react-router-dom": "^5.3.2",
     "@typescript-eslint/eslint-plugin": "^4.28.3",
     "@typescript-eslint/parser": "^4.28.3",
+    "concurrently": "^7.6.0",
     "cross-env": "^5.2.0",
     "css-loader": "^2.1.1",
     "debug": "^4.3.2",
@@ -124,7 +125,7 @@
     "react-icons": "^3.10.0",
     "react-jw-player": "^1.19.1",
     "react-loadingg": "^1.7.2",
-    "react-markdown": "^4.3.1",
+    "react-markdown": "^8.0.5",
     "react-notifications": "^1.7.2",
     "react-popup": "^0.10.0",
     "react-router-dom": "^5.2.0",

src/main/core/index.ts

@@ -37,7 +37,7 @@ export class CoreService {
   async install() {
     this.start_progress.message = 'Installing IPFS'
     await waIpfs.install({
-      version: 'v0.10.0',
+      version: 'v0.19.0',
       dev: process.env.NODE_ENV === 'development',
       recursive: true,
     })

src/renderer/App.tsx

@@ -27,7 +27,7 @@ import { CreatorStudioView } from './views/CreatorStudioView'
 import { useQuery, gql, ApolloClient, InMemoryCache } from '@apollo/client'
 
 export const IndexerClient = new ApolloClient({
-  uri: 'http://localhost:4568/v1/graphql',
+  uri: 'https://spk-union.us-west.web3telekom.xyz/api/v2/graphql',
   cache: new InMemoryCache(),
 })