reduce code

airyhq · Mar 23, 2021 · 21dfad6 · 21dfad6
1 parent c7ccd9a
commit 21dfad6
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 2 deletions.
diff --git a/frontend/ui/src/components/AiryWebsocket/index.tsx b/frontend/ui/src/components/AiryWebsocket/index.tsx
@@ -29,7 +29,8 @@ const mapDispatchToProps = dispatch => ({
   addMessages: (conversationId: string, messages: Message[]) => dispatch(addMessagesAction({conversationId, messages})),
   onChannel: (channel: Channel) => dispatch(setChannelAction(channel)),
   getConversationInfo: (conversationId: string) => dispatch(getConversationInfo(conversationId)),
-  onMetadata: (metadataEvent: MetadataEvent) => dispatch(setMetadataAction(camelcaseKeys(metadataEvent, {deep: true, stopPaths: ['metadata.userData']}))),
+  onMetadata: (metadataEvent: MetadataEvent) =>
+    dispatch(setMetadataAction(camelcaseKeys(metadataEvent, {deep: true, stopPaths: ['metadata.userData']}))),
 });
 
 const connector = connect(mapStateToProps, mapDispatchToProps);

diff --git a/frontend/ui/src/reducers/data/conversations/index.ts b/frontend/ui/src/reducers/data/conversations/index.ts
@@ -207,7 +207,6 @@ function allReducer(
             ...state.items[action.payload.identifier],
             metadata: {
               // Ensure that there is always a display name present
-              ...pick(state.items[action.payload.identifier]?.metadata, 'contact.displayName'),
               ...(<MetadataEvent<ConversationMetadata>>action.payload).metadata,
               contact: {
                 ...state.items[action.payload.identifier]?.metadata.contact,

diff --git a/infrastructure/.vagrant/bundler/global.sol b/infrastructure/.vagrant/bundler/global.sol
@@ -0,0 +1 @@
+{"dependencies":[["vagrant-hostsupdater",["= 1.2.1"]]],"checksum":"b72b91141b6c8871cd80b9844a374ae4fe4ac0c1b17bf42f4909f56647606795","vagrant_version":"2.2.10"}
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/action_provision b/infrastructure/.vagrant/machines/airy-core/virtualbox/action_provision
@@ -0,0 +1 @@
+1.5:4bae7e02-0b98-4552-9512-a93b495fc71d
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/action_set_name b/infrastructure/.vagrant/machines/airy-core/virtualbox/action_set_name
@@ -0,0 +1 @@
+1615815882
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/box_meta b/infrastructure/.vagrant/machines/airy-core/virtualbox/box_meta
@@ -0,0 +1 @@
+{"name":"generic/alpine310","version":"3.1.0","provider":"virtualbox","directory":"boxes/generic-VAGRANTSLASH-alpine310/3.1.0/virtualbox"}
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/creator_uid b/infrastructure/.vagrant/machines/airy-core/virtualbox/creator_uid
@@ -0,0 +1 @@
+501
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/id b/infrastructure/.vagrant/machines/airy-core/virtualbox/id
@@ -0,0 +1 @@
+4bae7e02-0b98-4552-9512-a93b495fc71d
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/index_uuid b/infrastructure/.vagrant/machines/airy-core/virtualbox/index_uuid
@@ -0,0 +1 @@
+6f56a95ddfbc41e2865a9d46629f3547
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/private_key b/infrastructure/.vagrant/machines/airy-core/virtualbox/private_key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAl3xpSKDDUOIiMtGFhd+OW0esWvzKVvVv9eW5HSGpZOIyIlvh
+6mVVlqKcRgKJnW3YhSxm4q4Ki6Zkus3ZyoJEDH4YvJas7P2pR0TVJxYHI0BGNnj0
+zKCXEMVNxwMDnYccg9RYEbNL7XTXk4w7LmOT6ODVQTbSv1GGGFUolFDjxahmTx/c
+P7nGPXPLigVa1ktcBvBgLL9yVgOR+3G6vdj5iOHBfwHA4WvJOhGl0YkSeJG9nPWq
+orDfElMEh9rJujqjjn449CeJnZsyelhCcwfgqubZuL8xo3lyFxbsmwkU3pfo/DDd
+aizOrYX3aQbOtstVwOF1Aoh5v4eb3ayFV4+v6QIDAQABAoIBAF1JKfSlu2GFwBWX
+XShRwPKJMqRdY6UlQ6sjqlk8L3qGqOTrvDWB7bDztlSOn3wo9tsbusgA8VGKSCGZ
+PnMswQcIZ+dKynauxp2yz6hgMkkM/a/x0J5qjlyvg/P38TQCzhaInytXRHyYJWEh
+TBiHDcCtI+YjAqj6ZR964aBkJ7/Bv6SDpEzwcReEzELf4rLvM1AruJpbsNCUCQMd
+6k4EXQhxQEIVFBGh+KSUg2BroZVfMLmS5F2HTJuXJ0Kla64bYUuGZgiINVeShWOR
+tGndVwxCUnq5apQA5+dMCfU+a36wyaYPcbbwCUUxDiGbmHxW0iQXJ4kuSnjwxoy3
+h/d48XkCgYEAxPjssx3iNxwrfM/SRkfFwMEQB+kRV8pRqBC2R7AspU//KaySM/E7
+yBC0PeF+goc9muKe7iWQFva1Iu5Wxc83U9LmlwYzrSBCZ8TQs3INlmxGP5ETOxkW
+wz6VzIB6zMOpzjjS5qNYtAl87yden2bdjfEGkXUfbzvAqUms9UVXV98CgYEAxOHr
+mpie4DWbWr5VmlSIYh/cdTOhPrAMiSMn296NKhXbJEPrmQYfRPRagEbspchLthOD
+rA6hkt6vaJW31mBrW1xLKVA+5wiRoj0djPoKLiwLslDnQ5OPobbFf1hzWzd1y/ZS
+VPif3CO1r8BlepTVV+Yfzdf+vlMkXHZmeJHKETcCgYBJhJNsQ1Ikuantmu/j9XP0
+/tpJ6Y7kkoopzZsLZNE1HoeheVzUcEyc3sc3dYuvkmTHA6DISFLgj1KKaCURDceb
+zNLuOY1eJ/VBH++5mm9B3sXVggOIglPBqgFlY+rxtHITm5f0J7G6+POdm7cwjcdR
+7E1ES0/hR48gYHRi02/HRwKBgG1pL0kmb4QhxkfTZjbxqyj8k8L+AimYJB9BzjC9
+qK0uoC2zIQZVBKOJN5H52CD5AjoY9h9zsg6wecIhEZys0Hxg+dPnqE0z0drbI8To
+Xyfxij55/0rqgfNYYsC2IsUaOPgz1uUplYz8u0cEIGDSvQyv8hSuZ/7UrWxE0AVI
+34ZZAoGBAKMEAAnnkxNY+4+eLuwNh35PfFIDVEwHS+ven6Q87pZ4LO3JvmhfeXO6
+5ySxohTlisfjHW4bfOar8uOXKiIDCBUeB6bJa8EFcGD2X0tLBeFn0TnolSz/A0KH
+6M2ql5IAUeNpp3ue0vYvLMdX3tTTYCB98znGdMDTVbSxg9MxX42q
+-----END RSA PRIVATE KEY-----
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/synced_folders b/infrastructure/.vagrant/machines/airy-core/virtualbox/synced_folders
@@ -0,0 +1 @@
+{"virtualbox":{"/vagrant":{"disabled":false,"guestpath":"/vagrant","hostpath":"/Users/aitor/Documents/Projects/Core/core/infrastructure","__vagrantfile":true}}}
diff --git a/infrastructure/.vagrant/machines/airy-core/virtualbox/vagrant_cwd b/infrastructure/.vagrant/machines/airy-core/virtualbox/vagrant_cwd
@@ -0,0 +1 @@
+/Users/aitor/Documents/Projects/Core/core/infrastructure
diff --git a/infrastructure/.vagrant/rgloader/loader.rb b/infrastructure/.vagrant/rgloader/loader.rb
@@ -0,0 +1,9 @@
+# This file loads the proper rgloader/loader.rb file that comes packaged
+# with Vagrant so that encoded files can properly run with Vagrant.
+
+if ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"]
+  require File.expand_path(
+    "rgloader/loader", ENV["VAGRANT_INSTALLER_EMBEDDED_DIR"])
+else
+  raise "Encoded files can't be read outside of the Vagrant installer."
+end