Merge upstream develop

Author: github-actions[bot]

.gitlab/ci/deploy_app.yml

@@ -18,21 +18,21 @@
     entrypoint: ['']
   script:
     - crane auth login $CI_REGISTRY -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
-    - crane tag $CI_REGISTRY_IMAGE/app:$CI_COMMIT_SHA $ENVIRONMENT
+    - crane tag $CI_REGISTRY_IMAGE/app:$CI_COMMIT_SHA $CI_ENVIRONMENT_NAME
   needs:
     - job: app-web-image
       artifacts: false
 
 app-deploy-image-staging:
   extends: .app-deploy-image
-  variables:
-    ENVIRONMENT: staging
+  environment:
+    name: staging
 
 app-deploy-image-production:
   extends: .app-deploy-image
   when: manual
-  variables:
-    ENVIRONMENT: production
+  environment:
+    name: production
 
 ###############################
 # Rolling restart on Manifest #

apps/polycentric/src/common/query/hooks/useQuery.ts

@@ -69,6 +69,7 @@ export const useQueryStore = create<QueryStoreState>((set, get) => {
       status: QueryStatus.Loading,
       error: null,
     });
+
     // Request from rs-core
     const observable = args.client.core.fetchQuery(
       args.queryKey,
@@ -81,7 +82,10 @@ export const useQueryStore = create<QueryStoreState>((set, get) => {
         updateQueryRef(key, { data: result.data, status: result.status });
       },
       error(message) {
-        updateQueryRef(key, { error: message, status: QueryStatus.Error });
+        console.warn(`useQuery[${key}] error: ${message}`);
+        if (get().queries.get(key)?.status === QueryStatus.Error) {
+          updateQueryRef(key, { error: message });
+        }
       },
       complete() {
         // Terminal status already arrived via the final `next`.

protos/polycentric/v2/common.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+package polycentric.v2;
+
+message PageInfo {
+  string end_cursor = 1;
+  bool has_next_page = 2;
+  bool has_previous_page = 3;
+  string start_cursor = 4;
+}

protos/polycentric/v2/notifications.proto

@@ -1,8 +1,32 @@
 syntax = "proto3";
 package polycentric.v2;
 
+import "polycentric/v2/common.proto";
+import "polycentric/v2/events.proto";
 import "polycentric/v2/server.proto";
 
+message Notification {
+  // Event that triggered the notification
+  EventBundle trigger_event = 1;
+  // Event that the notification is in relation to
+  EventBundle subject_event = 2;
+}
+
+message GetNotificationsRequest {
+  string identity = 1;
+  // Return the 1 X number of notifications
+  optional uint32 first = 2;
+  // Return notifications after a cursor
+  optional string after = 3;
+}
+
+message GetNotificationsResponse {
+  repeated Notification notification = 1;
+  // Events that help the client resolve with fewer network calls
+  repeated EventHint event_hints = 2;
+  PageInfo page_info = 3;
+}
+
 message RegisterPushNotificationRequest {
   string service = 1;
   string token = 2;
@@ -26,4 +50,4 @@ service NotificationService {
 
   // This endpoint expects a signed UnregisterPushNotificationRequest message
   rpc UnregisterPushNotifications(SignedMessage) returns (UnregisterPushNotificationResponse);
-}
+}