Merge branch 'dev' into immediate-finds

src/plugins/friendsSince/index.tsx

@@ -36,7 +36,7 @@ export default definePlugin({
         {
             find: ".UserPopoutUpsellSource.PROFILE_PANEL,",
             replacement: {
-                match: /\i.default,\{userId:(\i)}\)/,
+                match: /\i.default,\{userId:([^,]+?)}\)/,
                 replace: "$&,$self.friendsSince({ userId: $1 })"
             }
         },

src/plugins/showConnections/index.tsx

@@ -182,7 +182,7 @@ export default definePlugin({
             }
         },
         {
-            find: "\"Profile Panel: user cannot be undefined\"",
+            find: ".UserPopoutUpsellSource.PROFILE_PANEL,",
             replacement: {
                 // createElement(Divider, {}), createElement(NoteComponent)
                 match: /\(0,\i\.jsx\)\(\i\.\i,\{\}\).{0,100}setNote:(?=.+?channelId:(\i).id)/,