Updated OpenCL platforms error (#154)

SaladTechnologies · Sep 5, 2019 · b6b3d90 · b6b3d90
1 parent ee30b4c
commit b6b3d90
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 21 deletions.
diff --git a/packages/desktop-app/package.json b/packages/desktop-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "salad",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Salad Technologies Desktop Application",
   "author": "Salad Technologies <[email protected]>",
   "homepage": "https://www.salad.io/",

diff --git a/packages/desktop-app/src/Ethminer.ts b/packages/desktop-app/src/Ethminer.ts
@@ -23,14 +23,14 @@ export class Ethminer {
       // Anti-Virus
       { error: 'is not recognized as an internal or external command', code: 314159265 },
       { error: 'The system cannot find the path specified', code: 314159265 },
-      { error: 'No OpenCL platforms found', code: 314159265 },
       { error: 'Socket write failed', code: 314159265 },
       // CUDA
       { error: '3221225595', code: 8675309 },
       { error: '3221225781', code: 8675309 },
       { error: 'CUDA error: Insufficient CUDA driver: 9', code: 8675309 },
       { error: 'CUDA error: Insufficient CUDA driver: 7050', code: 8675309 },
       { error: 'CUDA error in func', code: 8675309 },
+      { error: 'No OpenCL platforms found', code: 8675309 },
       // Unknown
       { error: 'stratum  Error', code: 9999 },
       { error: 'exit: 0', code: 9999 },
@@ -62,10 +62,8 @@ export class Ethminer {
     let platform = cuda ? '-U' : '-G'
     this.processName = 'ethminer.exe'
 
-    let cmd = `cd dist && cd ethminer && ${
-      this.processName
-    } --farm-recheck 1000 ${platform} -P stratum1+tcp://0x6fF85749ffac2d3A36efA2BC916305433fA93731@eth-us-west1.nanopool.org:9999/${id}/notinuse%40salad.io`
-
+    let cmd = `cd dist && cd ethminer && ${this.processName} --farm-recheck 1000 ${platform} -P stratum1+tcp://0x6fF85749ffac2d3A36efA2BC916305433fA93731@eth-us-west1.nanopool.org:9999/${id}/notinuse%40salad.io`
+
     let ls = spawn(cmd, {
       shell: true,
       windowsHide: true,

diff --git a/packages/web-app/.env b/packages/web-app/.env
@@ -7,7 +7,7 @@ REACT_APP_API_URL=https://api.salad.io/core/master/
 REACT_APP_TERMS_VERSION=1.0
 REACT_APP_WHATS_NEW_VERSION=2
 REACT_APP_DATA_TRACKING_VERSION=1.0
-REACT_APP_VERSION=0.2.2
+REACT_APP_VERSION=0.2.3
 
 REACT_APP_SUPPORT_URL=https://salad.io/support
 REACT_APP_DISCORD_URL=https://discord.gg/xcvmgQk

diff --git a/packages/web-app/src/modules/error-views/components/CudaErrorPage.tsx b/packages/web-app/src/modules/error-views/components/CudaErrorPage.tsx
@@ -22,25 +22,21 @@ export class CudaErrorPage extends Component<Props> {
 
     return (
       <ErrorPage
-        title="Insufficient CUDA Driver"
+        title="Incompatible Drivers"
         onCloseClicked={onCloseClicked}
         showSendLog={showSendLog}
         onSendLog={this.handleSendLogClicked}
       >
         <div>
-          Just a quick warning that we’re detecting an insufficient{' '}
-          <ExternalLink path="https://en.wikipedia.org/wiki/CUDA">CUDA </ExternalLink>
-          version for your graphics card. This can cause major instability with Salad. We highly recommend{' '}
-          <ExternalLink path="https://www.windowscentral.com/how-properly-update-device-drivers-windows-10">
-            downloading the latest GPU drivers{' '}
-          </ExternalLink>
-          to make sure it’s performing at tip-top shape. No dull knives in the Salad Kitchen!
+          We’re detecting that your GPU drivers are incompatible with Salad. In order to get chopping you will need to
+          update the the latest drivers.
+          <ExternalLink path="https://www.nvidia.com/Download/index.aspx">NVIDIA Drivers</ExternalLink>
+          <ExternalLink path="https://www.amd.com/en/support">AMD Drivers</ExternalLink>
         </div>
         <div style={{ paddingTop: '1rem' }}>
-          If this issue persists, something else may be causing the problem. If so, please contact Salad Support, you
-          can either chat with us on <ExternalLink path="https://salad.zendesk.com/hc/en-us">Zendesk </ExternalLink>, or
-          join the
-          <ExternalLink path="https://discord.gg/XzyRcd8"> Discord </ExternalLink> for live help.
+          If this issue persists, something else may be causing the problem. If so, please contact
+          <ExternalLink path="https://www.salad.io/support/">Salad Support</ExternalLink>, or join the
+          <ExternalLink path="https://discord.gg/XzyRcd8"> Discord </ExternalLink> for updates.
         </div>
       </ErrorPage>
     )

diff --git a/packages/web-app/src/modules/error-views/components/UnknownErrorPage.tsx b/packages/web-app/src/modules/error-views/components/UnknownErrorPage.tsx
@@ -2,6 +2,7 @@ import React, { Component } from 'react'
 
 // Components
 import { ErrorPage } from '../../../components/ErrorPage'
+import { ExternalLink } from '../../../components'
 
 interface Props {
   onCloseClicked?: () => void
@@ -27,8 +28,10 @@ export class UnknownErrorPage extends Component<Props> {
         onSendLog={this.handleSendLogClicked}
       >
         <div>
-          We are sorry for the inconvenience. The salad miner has stopped working. Help us improve this experience and
-          squash this bug by sending us your logs.
+          We are sorry for the inconvenience, Salad doesn't seem to be working properly. If this issue persists,
+          something else may be causing the problem. If so, please contact
+          <ExternalLink path="https://www.salad.io/support/">Salad Support</ExternalLink>, join the
+          <ExternalLink path="https://discord.gg/XzyRcd8"> Discord </ExternalLink> for updates and send us your logs.
         </div>
       </ErrorPage>
     )