update package-lock & fix merge issue

Author: vas3a

client/src/redux/action-types.js

@@ -5,11 +5,13 @@ export const ns = 'app';
 export const actionTypes = createTypes(
   [
     'appMount',
+    'allowBlockDonationRequests',
     'hardGoTo',
     'closeDonationModal',
     'hideCodeAlly',
     'preventBlockDonationRequests',
     'preventProgressDonationRequests',
+    'tryToShowDonationModal',
     'openDonationModal',
     'onlineStatusChange',
     'serverStatusChange',