diff --git a/app/soapbox/components/column_back_button.js b/app/soapbox/components/column_back_button.js index 40840f8ada..75d5269928 100644 Binary files a/app/soapbox/components/column_back_button.js and b/app/soapbox/components/column_back_button.js differ diff --git a/app/soapbox/components/column_header.js b/app/soapbox/components/column_header.js index c13113db78..c5fa73e5d9 100644 Binary files a/app/soapbox/components/column_header.js and b/app/soapbox/components/column_header.js differ diff --git a/app/soapbox/components/dropdown_menu.js b/app/soapbox/components/dropdown_menu.js index 486aa0d589..685eff717f 100644 Binary files a/app/soapbox/components/dropdown_menu.js and b/app/soapbox/components/dropdown_menu.js differ diff --git a/app/soapbox/components/filter_bar.js b/app/soapbox/components/filter_bar.js index 172bbf4206..49fdb58ca3 100644 Binary files a/app/soapbox/components/filter_bar.js and b/app/soapbox/components/filter_bar.js differ diff --git a/app/soapbox/components/modal_root.js b/app/soapbox/components/modal_root.js index 599d090f6d..921a763a13 100644 Binary files a/app/soapbox/components/modal_root.js and b/app/soapbox/components/modal_root.js differ diff --git a/app/soapbox/components/permalink.js b/app/soapbox/components/permalink.js index fffbd5471a..5bae087ac1 100644 Binary files a/app/soapbox/components/permalink.js and b/app/soapbox/components/permalink.js differ diff --git a/app/soapbox/components/primary_navigation.js b/app/soapbox/components/primary_navigation.js index 924c914aad..5f33c96e93 100644 Binary files a/app/soapbox/components/primary_navigation.js and b/app/soapbox/components/primary_navigation.js differ diff --git a/app/soapbox/components/scrollable_list.js b/app/soapbox/components/scrollable_list.js index 6b406c7061..86a44f5973 100644 Binary files a/app/soapbox/components/scrollable_list.js and b/app/soapbox/components/scrollable_list.js differ diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js index b1cfee6570..bd57fcd2dc 100644 Binary files a/app/soapbox/components/status.js and b/app/soapbox/components/status.js differ diff --git a/app/soapbox/components/status_action_bar.js b/app/soapbox/components/status_action_bar.js index 1770d7cc21..c7567b6428 100644 Binary files a/app/soapbox/components/status_action_bar.js and b/app/soapbox/components/status_action_bar.js differ diff --git a/app/soapbox/components/status_content.js b/app/soapbox/components/status_content.js index 717071a5c8..be07ed28d9 100644 Binary files a/app/soapbox/components/status_content.js and b/app/soapbox/components/status_content.js differ diff --git a/app/soapbox/components/sub_navigation.js b/app/soapbox/components/sub_navigation.js index 0f9092760e..8797764190 100644 Binary files a/app/soapbox/components/sub_navigation.js and b/app/soapbox/components/sub_navigation.js differ diff --git a/app/soapbox/features/account_timeline/components/header.js b/app/soapbox/features/account_timeline/components/header.js index 5886979433..a86c7f7885 100644 Binary files a/app/soapbox/features/account_timeline/components/header.js and b/app/soapbox/features/account_timeline/components/header.js differ diff --git a/app/soapbox/features/account_timeline/components/moved_note.js b/app/soapbox/features/account_timeline/components/moved_note.js index 5963dbeeaf..fb2f000e89 100644 Binary files a/app/soapbox/features/account_timeline/components/moved_note.js and b/app/soapbox/features/account_timeline/components/moved_note.js differ diff --git a/app/soapbox/features/auth_login/components/registration_form.js b/app/soapbox/features/auth_login/components/registration_form.js index 8a6f7353f7..87de069c7f 100644 Binary files a/app/soapbox/features/auth_login/components/registration_form.js and b/app/soapbox/features/auth_login/components/registration_form.js differ diff --git a/app/soapbox/features/bookmarks/index.js b/app/soapbox/features/bookmarks/index.js index 0d25bb2aaa..f97d0554a1 100644 Binary files a/app/soapbox/features/bookmarks/index.js and b/app/soapbox/features/bookmarks/index.js differ diff --git a/app/soapbox/features/chats/components/chat_panes.js b/app/soapbox/features/chats/components/chat_panes.js index f70e71dc6c..900873e647 100644 Binary files a/app/soapbox/features/chats/components/chat_panes.js and b/app/soapbox/features/chats/components/chat_panes.js differ diff --git a/app/soapbox/features/chats/index.js b/app/soapbox/features/chats/index.js index 06b7f98020..5a23d31944 100644 Binary files a/app/soapbox/features/chats/index.js and b/app/soapbox/features/chats/index.js differ diff --git a/app/soapbox/features/community_timeline/index.js b/app/soapbox/features/community_timeline/index.js index 46e75aa6e4..dfc74ebb43 100644 Binary files a/app/soapbox/features/community_timeline/index.js and b/app/soapbox/features/community_timeline/index.js differ diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js index d6a743122a..7317d03828 100644 Binary files a/app/soapbox/features/compose/components/compose_form.js and b/app/soapbox/features/compose/components/compose_form.js differ diff --git a/app/soapbox/features/compose/components/reply_indicator.js b/app/soapbox/features/compose/components/reply_indicator.js index 3ea96f6b39..9203984168 100644 Binary files a/app/soapbox/features/compose/components/reply_indicator.js and b/app/soapbox/features/compose/components/reply_indicator.js differ diff --git a/app/soapbox/features/compose/components/search.js b/app/soapbox/features/compose/components/search.js index 6389d0785a..b605277d79 100644 Binary files a/app/soapbox/features/compose/components/search.js and b/app/soapbox/features/compose/components/search.js differ diff --git a/app/soapbox/features/compose/components/upload.js b/app/soapbox/features/compose/components/upload.js index 062ea92624..6c3ef5638a 100644 Binary files a/app/soapbox/features/compose/components/upload.js and b/app/soapbox/features/compose/components/upload.js differ diff --git a/app/soapbox/features/conversations/components/conversation.js b/app/soapbox/features/conversations/components/conversation.js index 2c8782e8b2..7179499683 100644 Binary files a/app/soapbox/features/conversations/components/conversation.js and b/app/soapbox/features/conversations/components/conversation.js differ diff --git a/app/soapbox/features/developers/developers_menu.js b/app/soapbox/features/developers/developers_menu.js index a0031497ec..afec34260e 100644 Binary files a/app/soapbox/features/developers/developers_menu.js and b/app/soapbox/features/developers/developers_menu.js differ diff --git a/app/soapbox/features/follow_recommendations/index.js b/app/soapbox/features/follow_recommendations/index.js index 5941f1f970..2e9e3bcc3c 100644 Binary files a/app/soapbox/features/follow_recommendations/index.js and b/app/soapbox/features/follow_recommendations/index.js differ diff --git a/app/soapbox/features/groups/create/index.js b/app/soapbox/features/groups/create/index.js index 271ac84021..7da3e4c6a6 100644 Binary files a/app/soapbox/features/groups/create/index.js and b/app/soapbox/features/groups/create/index.js differ diff --git a/app/soapbox/features/groups/edit/index.js b/app/soapbox/features/groups/edit/index.js index 16a691bd6c..8b8dc29760 100644 Binary files a/app/soapbox/features/groups/edit/index.js and b/app/soapbox/features/groups/edit/index.js differ diff --git a/app/soapbox/features/groups/timeline/components/header.js b/app/soapbox/features/groups/timeline/components/header.js index 1b1faa08fb..ff0327c3ee 100644 Binary files a/app/soapbox/features/groups/timeline/components/header.js and b/app/soapbox/features/groups/timeline/components/header.js differ diff --git a/app/soapbox/features/groups/timeline/index.js b/app/soapbox/features/groups/timeline/index.js index be58f51cd2..e959adcabe 100644 Binary files a/app/soapbox/features/groups/timeline/index.js and b/app/soapbox/features/groups/timeline/index.js differ diff --git a/app/soapbox/features/list_timeline/index.js b/app/soapbox/features/list_timeline/index.js index 584b11d45b..90ca0b9012 100644 Binary files a/app/soapbox/features/list_timeline/index.js and b/app/soapbox/features/list_timeline/index.js differ diff --git a/app/soapbox/features/notifications/components/notification.js b/app/soapbox/features/notifications/components/notification.js index 9f1598e241..b3475e1b84 100644 Binary files a/app/soapbox/features/notifications/components/notification.js and b/app/soapbox/features/notifications/components/notification.js differ diff --git a/app/soapbox/features/public_layout/components/header.js b/app/soapbox/features/public_layout/components/header.js index 2cb003b84c..a5e7ee6122 100644 Binary files a/app/soapbox/features/public_layout/components/header.js and b/app/soapbox/features/public_layout/components/header.js differ diff --git a/app/soapbox/features/public_timeline/index.js b/app/soapbox/features/public_timeline/index.js index 224151b172..142862c59e 100644 Binary files a/app/soapbox/features/public_timeline/index.js and b/app/soapbox/features/public_timeline/index.js differ diff --git a/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.js b/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.js index a5858de9e6..f9cc609a2d 100644 Binary files a/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.js and b/app/soapbox/features/remote_timeline/components/pinned_hosts_picker.js differ diff --git a/app/soapbox/features/remote_timeline/index.js b/app/soapbox/features/remote_timeline/index.js index d6b6ab2ef6..75103c69b9 100644 Binary files a/app/soapbox/features/remote_timeline/index.js and b/app/soapbox/features/remote_timeline/index.js differ diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js index 2579cc3388..0e17739016 100644 Binary files a/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js and b/app/soapbox/features/scheduled_statuses/components/scheduled_status_action_bar.js differ diff --git a/app/soapbox/features/scheduled_statuses/index.js b/app/soapbox/features/scheduled_statuses/index.js index 8b2fe3a561..314663f57d 100644 Binary files a/app/soapbox/features/scheduled_statuses/index.js and b/app/soapbox/features/scheduled_statuses/index.js differ diff --git a/app/soapbox/features/security/index.js b/app/soapbox/features/security/index.js index 887c162422..a65cc4b2de 100644 Binary files a/app/soapbox/features/security/index.js and b/app/soapbox/features/security/index.js differ diff --git a/app/soapbox/features/security/mfa_form.js b/app/soapbox/features/security/mfa_form.js index 072703b1a6..0990874fa6 100644 Binary files a/app/soapbox/features/security/mfa_form.js and b/app/soapbox/features/security/mfa_form.js differ diff --git a/app/soapbox/features/status/components/action_bar.js b/app/soapbox/features/status/components/action_bar.js index fecb664c27..c644940825 100644 Binary files a/app/soapbox/features/status/components/action_bar.js and b/app/soapbox/features/status/components/action_bar.js differ diff --git a/app/soapbox/features/status/components/detailed_status.js b/app/soapbox/features/status/components/detailed_status.js index b0e1b6a6c1..ed6641487e 100644 Binary files a/app/soapbox/features/status/components/detailed_status.js and b/app/soapbox/features/status/components/detailed_status.js differ diff --git a/app/soapbox/features/status/components/quoted_status.js b/app/soapbox/features/status/components/quoted_status.js index 56dc470292..c3af169ce7 100644 Binary files a/app/soapbox/features/status/components/quoted_status.js and b/app/soapbox/features/status/components/quoted_status.js differ diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js index 9c63ccc780..ba11376fbc 100644 Binary files a/app/soapbox/features/status/index.js and b/app/soapbox/features/status/index.js differ diff --git a/app/soapbox/features/ui/components/birthdays_modal.js b/app/soapbox/features/ui/components/birthdays_modal.js index 9a0744ba7a..46b609f301 100644 Binary files a/app/soapbox/features/ui/components/birthdays_modal.js and b/app/soapbox/features/ui/components/birthdays_modal.js differ diff --git a/app/soapbox/features/ui/components/boost_modal.js b/app/soapbox/features/ui/components/boost_modal.js index c148edc2e0..c518ea172f 100644 Binary files a/app/soapbox/features/ui/components/boost_modal.js and b/app/soapbox/features/ui/components/boost_modal.js differ diff --git a/app/soapbox/features/ui/components/media_modal.js b/app/soapbox/features/ui/components/media_modal.js index 786433ec3a..8e80535496 100644 Binary files a/app/soapbox/features/ui/components/media_modal.js and b/app/soapbox/features/ui/components/media_modal.js differ diff --git a/app/soapbox/features/ui/components/reblogs_modal.js b/app/soapbox/features/ui/components/reblogs_modal.js index 662ec48c74..60da89ded8 100644 Binary files a/app/soapbox/features/ui/components/reblogs_modal.js and b/app/soapbox/features/ui/components/reblogs_modal.js differ diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js index 26731c95f9..052b91623f 100644 Binary files a/app/soapbox/features/ui/components/tabs_bar.js and b/app/soapbox/features/ui/components/tabs_bar.js differ diff --git a/app/soapbox/features/ui/components/video_modal.js b/app/soapbox/features/ui/components/video_modal.js index 1291d32b16..a42cc76d2d 100644 Binary files a/app/soapbox/features/ui/components/video_modal.js and b/app/soapbox/features/ui/components/video_modal.js differ diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js index ca9c94e18a..f5cfd9f5ac 100644 Binary files a/app/soapbox/features/ui/index.js and b/app/soapbox/features/ui/index.js differ diff --git a/package.json b/package.json index 81a861e973..c3b930599e 100644 --- a/package.json +++ b/package.json @@ -140,7 +140,7 @@ "react-overlays": "^0.9.0", "react-popper": "^2.2.3", "react-redux": "^7.2.5", - "react-router-dom": "^4.3.1", + "react-router-dom": "^5.3.0", "react-router-scroll-4": "^1.0.0-beta.1", "react-simple-pull-to-refresh": "^1.3.0", "react-sparklines": "^1.7.0", diff --git a/yarn.lock b/yarn.lock index 6a8b8f0e44..d7d39942ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1141,6 +1141,13 @@ dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.12.13": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" + integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@^7.17.0": version "7.17.7" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.7.tgz#a5f3328dc41ff39d803f311cfe17703418cf9825" @@ -5197,7 +5204,7 @@ hex-color-regex@^1.1.0: resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e" integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ== -history@^4.10.1, history@^4.7.2: +history@^4.10.1, history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== @@ -5209,12 +5216,7 @@ history@^4.10.1, history@^4.7.2: tiny-warning "^1.0.0" value-equal "^1.0.1" -hoist-non-react-statics@^2.5.0: - version "2.5.5" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" - integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw== - -hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: +hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== @@ -7230,6 +7232,14 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== +mini-create-react-context@^0.4.0: + version "0.4.1" + resolved "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz#072171561bfdc922da08a60c2197a497cc2d1d5e" + integrity sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ== + dependencies: + "@babel/runtime" "^7.12.1" + tiny-warning "^1.0.3" + mini-css-extract-plugin@^1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.6.2.tgz#83172b4fd812f8fc4a09d6f6d16f924f53990ca8" @@ -8414,7 +8424,7 @@ prop-types-extra@^1.0.1: react-is "^16.3.2" warning "^4.0.0" -prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: +prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== @@ -8658,7 +8668,7 @@ react-intl@^5.0.0: intl-messageformat "9.9.1" tslib "^2.1.0" -react-is@^16.13.1, react-is@^16.3.2, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6: +react-is@^16.13.1, react-is@^16.3.2, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.6: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -8726,17 +8736,18 @@ react-redux@^7.2.5: prop-types "^15.7.2" react-is "^16.13.1" -react-router-dom@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-4.3.1.tgz#4c2619fc24c4fa87c9fd18f4fb4a43fe63fbd5c6" - integrity sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA== +react-router-dom@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.0.tgz#da1bfb535a0e89a712a93b97dd76f47ad1f32363" + integrity sha512-ObVBLjUZsphUUMVycibxgMdh5jJ1e3o+KpAZBVeHcNQZ4W+uUGGWsokurzlF4YOldQYRQL4y6yFRWM4m3svmuQ== dependencies: - history "^4.7.2" - invariant "^2.2.4" + "@babel/runtime" "^7.12.13" + history "^4.9.0" loose-envify "^1.3.1" - prop-types "^15.6.1" - react-router "^4.3.1" - warning "^4.0.1" + prop-types "^15.6.2" + react-router "5.2.1" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" react-router-scroll-4@^1.0.0-beta.1: version "1.0.0-beta.2" @@ -8746,18 +8757,21 @@ react-router-scroll-4@^1.0.0-beta.1: scroll-behavior "^0.9.1" warning "^3.0.0" -react-router@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-4.3.1.tgz#aada4aef14c809cb2e686b05cee4742234506c4e" - integrity sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg== +react-router@5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.2.1.tgz#4d2e4e9d5ae9425091845b8dbc6d9d276239774d" + integrity sha512-lIboRiOtDLFdg1VTemMwud9vRVuOCZmUIT/7lUoZiSpPODiiH1UQlfXy+vPLC/7IWdFYnhRwAyNqA/+I7wnvKQ== dependencies: - history "^4.7.2" - hoist-non-react-statics "^2.5.0" - invariant "^2.2.4" + "@babel/runtime" "^7.12.13" + history "^4.9.0" + hoist-non-react-statics "^3.1.0" loose-envify "^1.3.1" + mini-create-react-context "^0.4.0" path-to-regexp "^1.7.0" - prop-types "^15.6.1" - warning "^4.0.1" + prop-types "^15.6.2" + react-is "^16.6.0" + tiny-invariant "^1.0.2" + tiny-warning "^1.0.0" react-side-effect@^2.1.0: version "2.1.1" @@ -10104,7 +10118,7 @@ tiny-queue@^0.2.1: resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046" integrity sha1-JaZ/LG4lOyypQZd7XvdELvl6YEY= -tiny-warning@^1.0.0: +tiny-warning@^1.0.0, tiny-warning@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==