Merge pull request #118 from duality-solutions/v1.0.1-WIP2

pShare v1.0.1 Release Candidate 2

.travis.yml

@@ -12,7 +12,7 @@ before_install:
   - echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
   - sudo apt-get update && sudo apt-get install --no-install-recommends yarn
   - nvm install lts/dubnium && nvm use lts/dubnium  && npm install -g yarn
-  - yarn compile
+  - yarn install
 cache:
   apt: true
 jobs:
@@ -27,10 +27,6 @@ jobs:
         name: 'pShare Windows Installer'
         install:
           - sudo dpkg --add-architecture i386
-          - wget -nc https://dl.winehq.org/wine-builds/winehq.key
-          - sudo apt-key add winehq.key
-          - sudo apt-add-repository 'deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main'
-          - sudo apt-get update
-          - sudo apt-get install --install-recommends winehq-stable
+          - sudo apt install wine64
         script:
           - ./build.win.sh

README.md

@@ -1,4 +1,5 @@
 ## pShare
+[![](https://snyk.io/test/github/duality-solutions/pShare/badge.svg?targetFile=package.json)](https://snyk.io/test/github/duality-solutions/pShare?targetFile=package.json) [![](https://travis-ci.org/duality-solutions/pShare.svg?branch=master)](https://travis-ci.org/duality-solutions/pShare.svg?branch=master)
 
 ### Software Objectives:
 - Privately and securely share data with friends, family, and business associates.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pshare",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Secure and private peer to peer file sharing",
   "homepage": "https://duality.solutions/pshare",
   "license": "SEE LICENSE IN LICENSE.md",
@@ -50,8 +50,8 @@
     "mime-types": "^2.1.22",
     "pify": "^4.0.1",
     "progress-stream": "^2.0.0",
-    "qrcode-generator": "^1.4.3",
-    "react": "^16.8.6",
+    "qrcode-generator": "^1.4.4",
+    "react": "^16.12.0",
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.8.6",
     "react-dropzone": "^10.0.0",
@@ -67,7 +67,7 @@
     "redux-saga": "^0.16.2",
     "reselect": "^4.0.0",
     "rxjs": "^6.3.3",
-    "seedrandom": "^2.4.4",
+    "seedrandom": "^3.0.5",
     "sjcl-git": "https://github.com/bitwiseshiftleft/sjcl.git#1.0.8",
     "source-map-support": "^0.5.9",
     "stream-buffers": "^3.0.2",
@@ -104,7 +104,7 @@
     "@types/styled-components": "^4.1.6",
     "@types/uuid": "^3.4.4",
     "@types/webdriverio": "^4.13.0",
-    "electron": "3.0.10",
+    "electron": "3.0.16",
     "electron-builder": "^20.36.2",
     "electron-webpack": "^2.6.1",
     "electron-webpack-ts": "^3.1.0",

src/main/index.ts

@@ -201,6 +201,10 @@ if (!hasLock) {
         console.log("closing rtc window")
         rtcWindow.close()
       }
+      if (aboutPanelWindow) {
+        console.log("closing about window");
+        aboutPanelWindow.close();
+      }
     })
 
     window.webContents.on('devtools-opened', () => {

src/renderer/components/dashboard/AddFile.tsx

@@ -62,7 +62,6 @@ export const AddFile: FunctionComponent<AddFileProps> = ({ close, filesSelected,
                         <Dropzone error={error} filesSelected={filesSelectedHandler} directoriesSelected={directoriesSelectedHander} multiple={true} ></Dropzone>
                     </Box>
                 </Box>
-                <Text align="center" fontSize="0.8em" margin="5em" color="#4a4a4a"> File size limit: 3gb</Text>
             </Container>
         </Box>
     </div>;

src/renderer/components/onboarding/CreateAccount.tsx

@@ -43,12 +43,12 @@ export const CreateAccount: React.FunctionComponent<CreateAccountProps> =
                             <SCard onClick={() => restoreAccount()}>
                                 <img src={restoreIcon} height="80px" width="80px" />
                                 <H3 align="center" color="white">Restore Account</H3>
-                                <Text color="white" align="center">You have a backed up mnemonic or file you would like to restore from</Text>
+                                <Text color="white" align="center">You have a backed up mnemonic phrase or secure file to restore from</Text>
                             </SCard>
                         </Box>
                     </Box>
                 </Container>
 
 
             </CSSTransitionGroup>
-        </> 
+        </> 

src/renderer/components/onboarding/MnemonicPage.tsx

@@ -48,7 +48,7 @@ export const MnemonicPage: FunctionComponent<MnemonicPageProps> = props => {
                     <Box direction="column" align="center" width="100%">
                         <Box direction="column" width="700px" align="start" margin="0 auto 0 auto">
                             <Card width="100%" align="center" minHeight="225px" padding="2em 4em 2em 4em">
-                                <H3>Your Mnemonic Pass Phrase</H3>
+                                <H3>Your Mnemonic Passphrase</H3>
                                 <Card width="100%" align="center" padding="1em" border="solid 1px grey" background="#fafafa">
                                     <Text color="grey" align="center" margin="0" notUserSelectable>{props.mnemonic}</Text>
                                 </Card>

yarn.lock

@@ -3631,10 +3631,10 @@ electron-webpack@^2.6.1:
     webpack-merge "^4.1.4"
     yargs "^12.0.5"
 
-electron@3.0.10:
-  version "3.0.10"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.10.tgz"
-  integrity sha512-I39IeQP3NOlbjKzTDK8uK2JdiHDfhV5SruCS2Gttkn2MaKCY+yIzQ6Wr4DyBXLeTEkL1sbZxbqQVhCavAliv5w==
+electron@3.0.16:
+  version "3.0.16"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-3.0.16.tgz#a1279c8707cd2c2b11b9a756dd8db50e99e9fab6"
+  integrity sha512-H1FCMT/yhAzOcKqGVL2nZU238aJSa+3Wc7gQS7UcngHdznHVocNZiakalBruk7roFbqjKxdi6TQ8/PGuBg87oA==
   dependencies:
     "@types/node" "^8.0.24"
     electron-download "^4.1.0"
@@ -5949,9 +5949,9 @@ lockfile@^1.0.4:
     signal-exit "^3.0.2"
 
 lodash-es@^4.2.1:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz"
-  integrity sha512-DHb1ub+rMjjrxqlB3H56/6MXtm1lSksDp2rA2cNWjG8mlDUYFhUj3Di2Zn5IwSU87xLv8tNIQ7sSwE/YOX/D/Q==
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
+  integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
@@ -7433,15 +7433,7 @@ prompts@^2.0.1:
     kleur "^3.0.3"
     sisteransi "^1.0.3"
 
-prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.6.1, prop-types@^15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz"
-  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
-  dependencies:
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-prop-types@^15.5.8, prop-types@^15.7.2:
+prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -7525,10 +7517,10 @@ q@^1.1.2, q@~1.5.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz"
 
-qrcode-generator@^1.4.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.3.tgz#4876e8f280e65b6c94615f4c19c484f6b964b199"
-  integrity sha512-++rVRvMRq5BlHfmAafl8a4ppUntzUxCCUTT2t0siUgqKwdnqRzY8IH6f6WSX5dZUhD2Ul5/MIKuTJddflwrGzw==
+qrcode-generator@^1.4.4:
+  version "1.4.4"
+  resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.4.tgz#63f771224854759329a99048806a53ed278740e7"
+  integrity sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw==
 
 qs@6.7.0:
   version "6.7.0"
@@ -7696,15 +7688,14 @@ react-transition-group@1.2.1:
     prop-types "^15.5.6"
     warning "^3.0.0"
 
-react@^16.8.6:
-  version "16.8.6"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz"
-  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
+react@^16.12.0:
+  version "16.12.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz#0c0a9c6a142429e3614834d5a778e18aa78a0b83"
+  integrity sha512-fglqy3k5E+81pA8s+7K0/T3DBCF0ZDOher1elBFzF7O6arXJgzyu/FW+COxFvAWXJoJN9KIZbT2LXlukwphYTA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.6"
 
 read-config-file@3.2.0, read-config-file@^3.2.0:
   version "3.2.0"
@@ -8280,10 +8271,10 @@ seamless-immutable@^7.1.3:
   resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz"
   integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A==
 
-seedrandom@^2.4.4:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-2.4.4.tgz"
-  integrity sha512-9A+PDmgm+2du77B5i0Ip2cxOqqHjgNxnBgglxLcX78A2D6c2rTo61z4jnVABpF4cKeDMDG+cmXXvdnqse2VqMA==
+seedrandom@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/seedrandom/-/seedrandom-3.0.5.tgz#54edc85c95222525b0c7a6f6b3543d8e0b3aa0a7"
+  integrity sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==
 
 select-hose@^2.0.0:
   version "2.0.0"