Fix #17 - Upgrades RNShare package and honor filtered parties in imag…

…e generation
MOVACT · Aug 21, 2021 · 23df279 · 23df279
1 parent 1493bad
commit 23df279
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 19 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -143,7 +143,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 45
-        versionName "3.4.2"
+        versionName "3.4.3"
         multiDexEnabled true
     }
     signingConfigs {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
   package="com.wahlswiper">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
       android:name=".MainApplication"

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
-  - BNFMatomo (0.1.2):
-    - React-Core
+  - BNFMatomo (0.2.0):
+    - React
   - boost-for-react-native (1.63.0)
   - BVLinearGradient (2.5.6):
     - React
@@ -273,13 +273,13 @@ PODS:
     - React
   - RNGestureHandler (1.9.0):
     - React-Core
-  - RNLocalize (2.0.1):
+  - RNLocalize (2.1.1):
     - React-Core
   - RNReanimated (1.13.2):
     - React-Core
   - RNScreens (2.16.1):
     - React-Core
-  - RNShare (4.1.1):
+  - RNShare (7.0.0):
     - React-Core
   - RNSVG (12.1.0):
     - React
@@ -423,7 +423,7 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  BNFMatomo: 9cbb34c9d2562da71fc2bbc74ffaa429e4d20f0c
+  BNFMatomo: b63c204d39b0c4f881862f76c696cfb7fd4f3a0d
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
   DoubleConversion: cde416483dac037923206447da6e1454df403714
@@ -461,10 +461,10 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 05bae7ecfab1cbd5441993f1ca098f7c3b3f8d0e
   RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f
   RNGestureHandler: 9b7e605a741412e20e13c512738a31bd1611759b
-  RNLocalize: 41026b7c14878f1a1b381bc79f668f1fbf841adb
+  RNLocalize: 82a569022724d35461e2dc5b5d015a13c3ca995b
   RNReanimated: e03f7425cb7a38dcf1b644d680d1bfc91c3337ad
   RNScreens: 45c457af3d2ee9e08fc01e70da87e653d46b1198
-  RNShare: 26cad4c6f7e0229cc6f7e143444928f36c0ee3d1
+  RNShare: 00e7409201e3cab13e0febc41fd4465a83ae8225
   RNSVG: ce9d996113475209013317e48b05c21ee988d42e
   Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
 

diff --git a/ios/voteswiper.xcodeproj/project.pbxproj b/ios/voteswiper.xcodeproj/project.pbxproj
@@ -964,7 +964,7 @@
 				);
 				INFOPLIST_FILE = voteswiper/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.4.2;
+				MARKETING_VERSION = 3.4.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1004,7 +1004,7 @@
 				);
 				INFOPLIST_FILE = voteswiper/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 3.4.2;
+				MARKETING_VERSION = 3.4.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1263,7 +1263,7 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 3.4.2;
+				MARKETING_VERSION = 3.4.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = de.movact.wahlswiper.OneSignalNotificationServiceExtension;
@@ -1300,7 +1300,7 @@
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 					"\"$(SRCROOT)/$(TARGET_NAME)\"",
 				);
-				MARKETING_VERSION = 3.4.2;
+				MARKETING_VERSION = 3.4.3;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = de.movact.wahlswiper.OneSignalNotificationServiceExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "react-native-restart": "^0.0.20",
     "react-native-safe-area-context": "^3.1.9",
     "react-native-screens": "^2.16.1",
-    "react-native-share": "^4.1.1",
+    "react-native-share": "^7.0.0",
     "react-native-svg": "^12.1.0",
     "react-native-video": "^5.1.0-alpha8",
     "storyblok-js-client": "^4.1.3",

diff --git a/src/screens/SwiperResult/index.tsx b/src/screens/SwiperResult/index.tsx
@@ -277,10 +277,12 @@ const SwiperResult: React.FC = () => {
           }
 
           const partyDetails = election!.parties.find((p) => p.id === party.id);
-
           if (!partyDetails) {
             return null;
           }
+          if (parties[election!.id].indexOf(party.id) === -1) {
+            return null;
+          }
 
           return (
             'score[]=' +
@@ -317,7 +319,7 @@ const SwiperResult: React.FC = () => {
           });
         };
       });
-  }, [election, ordered, t]);
+  }, [election, ordered, parties, t]);
 
   if (loading) {
     return (

diff --git a/yarn.lock b/yarn.lock
@@ -6462,10 +6462,10 @@ react-native-screens@^2.16.1:
   resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.16.1.tgz#b105a127378d90018a46daf0c2f6518fca60c06f"
   integrity sha512-WZ7m0sBDVaHbBnlHxwQnUlI6KNfQKHq+Unfw+VBuAlnSXvT+aw6Bb/K2bUlHzBgvrPjwY3Spc7ZERFuTwRLLwg==
 
-react-native-share@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/react-native-share/-/react-native-share-4.1.1.tgz#f36d03d293379a5e3b9782e921beab5aa6093cd1"
-  integrity sha512-3wXzZ2bcRH3fyMmq0ZtWE0wy2SeM9khpJo++JPJK22H5oKwe5IRX1yk8aPXtJG/S5UC2/2QQoh/MHtcGDZ4yLA==
+react-native-share@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/react-native-share/-/react-native-share-7.0.0.tgz#38a1e875c216bf39564e40edcef246c7f5d95615"
+  integrity sha512-2ImJYJotFg3bTihNrQIqDKCAJ2xV0/MjGmH5MaC1GXDvGTeuU1L2/sFrJLHTAYi+K6D6VTWGbv5h9SzXtuo39Q==
 
 react-native-svg@^12.1.0:
   version "12.1.0"