Merge branch 'release/3.5.5'

standardnotes · Nov 10, 2020 · 1fa1b25 · 1fa1b25
2 parents 5ecc00a + 2f74d05
commit 1fa1b25
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -249,7 +249,7 @@ PODS:
     - React-Core
   - react-native-version-info (1.1.0):
     - React-Core
-  - react-native-webview (10.10.0):
+  - react-native-webview (10.10.2):
     - React-Core
   - React-RCTActionSheet (0.62.2):
     - React-Core/RCTActionSheetHeaders (= 0.62.2)
@@ -555,7 +555,7 @@ SPEC CHECKSUMS:
   react-native-segmented-control: eb9e25fbfbce226ecf66d643428fbe97601e691a
   react-native-sodium: dd3c708254bb924d96f2d80768f114fa4bfe1c3f
   react-native-version-info: 36490da17d2c6b5cc21321c70e433784dee7ed0b
-  react-native-webview: 73e409ecc987c189772bda27ba7f0e2f3dcd2e81
+  react-native-webview: 0aa2cde4ee7e3e1c5fffdf64dbce9c709aa18155
   React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c
   React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0
   React-RCTBlob: a332773f0ebc413a0ce85942a55b064471587a71

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "StandardNotes",
-  "version": "3.5.4",
-  "user-version": "3.5.4",
+  "version": "3.5.5",
+  "user-version": "3.5.5",
   "private": true,
   "license": "AGPL-3.0-or-later",
   "scripts": {
@@ -51,11 +51,11 @@
     "react-native-tab-view": "^2.15.2",
     "react-native-vector-icons": "^7.1.0",
     "react-native-version-info": "^1.1.0",
-    "react-native-webview": "^10.10.0",
+    "react-native-webview": "^10.10.2",
     "react-navigation-header-buttons": "^6.0.0",
     "sn-textview": "standardnotes/sn-textview#440dbd60eedef4397b6272735e68d4579bb41ac8",
     "sncrypto": "standardnotes/sncrypto#5f8cd36",
-    "snjs": "standardnotes/snjs#6388e30976c05a004a6c289b14d99058e349c018",
+    "snjs": "standardnotes/snjs#def68479f53238c81096bc872a6823cd249d084d",
     "standard-notes-rn": "standardnotes/standard-notes-rn#996b016",
     "styled-components": "^5.2.1"
   },

diff --git a/src/screens/Compose/ComponentView.tsx b/src/screens/Compose/ComponentView.tsx
@@ -54,7 +54,7 @@ export const ComponentView = ({
 
   // Ref
   const webViewRef = useRef<WebView>(null);
-  const timeoutRef = useRef<NodeJS.Timeout | undefined>(undefined);
+  const timeoutRef = useRef<number | undefined>(undefined);
 
   useEffect(() => {
     if (liveComponent?.item.uuid !== componentUuid) {

diff --git a/src/screens/Compose/Compose.tsx b/src/screens/Compose/Compose.tsx
@@ -68,8 +68,8 @@ export const Compose = (): JSX.Element => {
 
   // Ref
   const editorViewRef = useRef<SNTextView>(null);
-  const saveTimeoutRef = useRef<NodeJS.Timeout | undefined>(undefined);
-  const statusTimeoutRef = useRef<NodeJS.Timeout | undefined>(undefined);
+  const saveTimeoutRef = useRef<number | undefined>(undefined);
+  const statusTimeoutRef = useRef<number | undefined>(undefined);
   const alreadySaved = useRef(false);
 
   const dissmissKeybard = () => {

diff --git a/src/screens/Notes/NoteCell.tsx b/src/screens/Notes/NoteCell.tsx
@@ -41,7 +41,7 @@ export const NoteCell = ({
   const [selected, setSelected] = useState(false);
 
   // Ref
-  const selectionTimeout = useRef<NodeJS.Timeout>();
+  const selectionTimeout = useRef<number>();
   const elementRef = useRef<View>(null);
 
   const { showActionSheet } = useCustomActionSheet();

diff --git a/yarn.lock b/yarn.lock
@@ -7229,10 +7229,10 @@ react-native-version-info@^1.1.0:
   resolved "https://registry.yarnpkg.com/react-native-version-info/-/react-native-version-info-1.1.0.tgz#1407de863cae4dbbeeadb9c173a295a7774b6884"
   integrity sha512-0QmJjdKyaW+G/TiOWkwzGVv1G3FPnWrPH5SYWloUpv8WA7onuQESYHdLyjfCUInYI/FHVeEynE2VomOOsda8wQ==
 
-react-native-webview@^10.10.0:
-  version "10.10.0"
-  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-10.10.0.tgz#285703c35eac1eac5b4446df2cba8a146d3c8548"
-  integrity sha512-T0AnZ0LVhaFBqZpl5attDDYo83zqdFRsFVINbrgHaIm6w5r0d/QK/dJRgXRNyFhn1fSONhe0ejdcnCYCT73B6g==
+react-native-webview@^10.10.2:
+  version "10.10.2"
+  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-10.10.2.tgz#13208aef17c9ccfd28355363688f4cbe2143f10a"
+  integrity sha512-98Dh7q1gEflicFZ8KNL3nK5XRjx50OZXqw87jHofVjKfjbK0LKmvI5X8ymgUMGg61JVgI3AF+g8qpDvqjgQsfg==
   dependencies:
     escape-string-regexp "2.0.0"
     invariant "2.2.4"
@@ -7987,9 +7987,9 @@ sncrypto@standardnotes/sncrypto#5f8cd36:
   version "1.2.0"
   resolved "https://codeload.github.com/standardnotes/sncrypto/tar.gz/5f8cd369773cec7f342c23ecaa659d932b35cd31"
 
-snjs@standardnotes/snjs#6388e30976c05a004a6c289b14d99058e349c018:
+snjs@standardnotes/snjs#def68479f53238c81096bc872a6823cd249d084d:
   version "1.0.5"
-  resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/6388e30976c05a004a6c289b14d99058e349c018"
+  resolved "https://codeload.github.com/standardnotes/snjs/tar.gz/def68479f53238c81096bc872a6823cd249d084d"
 
 source-map-resolve@^0.5.0:
   version "0.5.3"