Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Commit 4b72106

Browse files
miyakojmiyakoj
authored
Merge pull request #42 from swiftlettech/dev
Prep for v1.0
2 parents 71f69eb + 3f616e1 commit 4b72106

File tree

10 files changed

+720
-713
lines changed

10 files changed

+720
-713
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SmartSweeper
22

33
### Note
4-
SmartSweeper is currently in beta. You fund projects at your own risk. Bug fixes and new features will be added to the dev branch first.
4+
Bug fixes and new features will be added to the dev branch first.
55

66
### Description
77
Sweeper application for [SmartCash cryptocurrency](http://smartcash.cc) to allow easy retrieval of gift funds. Runs only on Windows 7, 8, and 10 at the moment. It isn't necessary to input your wallet passphrase to use SmartSweeper.
@@ -98,7 +98,7 @@ The log files are also in JSON format and can be viewed with a general log viewe
9898

9999
## Known issues
100100
* SmartSweeper may not open the SmartCash Node Client. If smartcash.conf hasn't been modified with the info above, SmartSweeper won't work if the node client is run manually.
101-
* electron-store error "EPERM operation not permitted" sometimes occurs on Windows when reading a config file. SmartSweeper will exit when it does.
101+
* electron-store error "EPERM operation not permitted" sometimes occurs on Windows when writing to a config file. SmartSweeper will exit when it does.
102102
* Can't connect to the node client via RPC when it's syncing (SmartSweeper will display the "Can't connect to SmartCash Node Client." error). This will cause some actions to fail and some project data updates to not occur.
103103
* Empty log files are sometimes created in the root SmartSweeper data folder.
104104
* There is lag when entering text into input fields.

‎app/fund/paperWallet.html‎

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

‎app/utils/splash.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<body>
3636
<div id="textArea">
3737
<div id="loadingMsg">Loading...</div>
38-
<div id="versionNum">v0.9.4</div>
38+
<div id="versionNum">v1.0</div>
3939
</div>
4040

4141
<script>

‎app/utils/statusMsgs.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<div id="betaVersion" class="alert alert-warning" role="alert"><i class="fa fa-fw fa-exclamation-circle"></i> SmartSweeper is still in beta. Fund projects at your own risk.</div>
2-
31
<div id="notOnline" class="alert alert-danger" role="alert" ng-show="!$mainCtrl.isOnline"><i class="fa fa-fw fa-exclamation-circle"></i> You are currently disconnected from the Internet. Some functions will not work.</div>
42

53
<div id="preCore" class="alert alert-info" role="alert" ng-hide="$mainCtrl.coreRunning || $mainCtrl.coreError"><i class="fa fa-fw fa-exclamation-circle"></i> Launching SmartCash Node Client (if not already running)...</div>

‎background/background.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
const config = window.nodeRequire("exp-config");
55
const electron = window.nodeRequire('electron');
66
const remote = electron.remote;
7-
const {ipcRenderer} = electron;
7+
const {app, ipcRenderer} = electron;
88
const path = window.nodeRequire('path');
99
const cp = window.nodeRequire('child_process');
1010

@@ -46,7 +46,7 @@
4646
},
4747
fatal: true
4848
};
49-
ipcRenderer.send('showErrorDialog', content);
49+
ipcRenderer.send('showErrorDialog', content.text);
5050
}
5151
},
5252
showDialog: true
@@ -67,7 +67,7 @@
6767
},
6868
fatal: true
6969
};
70-
ipcRenderer.send('showErrorDialog', content);
70+
ipcRenderer.send('showErrorDialog', content.text);
7171
return;
7272
}
7373

@@ -313,10 +313,19 @@
313313

314314
smartcash.unref();
315315
smartcash.on('error', (err) => {
316-
console.log('tried to open the node client and failed');
317316
console.log(err);
317+
318318
remote.getGlobal('sharedObject').sysLogger.error('appInit - start Smartcash core: ' + err);
319319
remote.getGlobal('sharedObject').coreError = true;
320+
321+
var content = {
322+
text: {
323+
title: 'Error',
324+
body: 'The SmartCash node client cannot be loaded. Please check smartcashPath in .env.'
325+
},
326+
fatal: false
327+
};
328+
ipcRenderer.send('showErrorDialog', content.text);
320329
});
321330

322331
setTimeout(() => {

‎images/wallet_bg.png‎

-53.7 KB
Loading

0 commit comments

Comments
 (0)