Merge branch 'main' into persist-share-as-image-choices

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
  applicationId "app.vger.voyager"
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 262
- versionName "2.18.0"
+ versionCode 263
+ versionName "2.18.1"
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  aaptOptions {
  // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

ios/App/App/Info.plist

@@ -17,7 +17,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>2.18.0</string>
+ <string>2.18.1</string>
  <key>CFBundleURLTypes</key>
  <array>
  <dict>
@@ -32,7 +32,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>262</string>
+ <string>263</string>
  <key>ITSAppUsesNonExemptEncryption</key>
  <false/>
  <key>LSRequiresIPhoneOS</key>

package.json

@@ -2,7 +2,7 @@
  "name": "voyager",
  "description": "A progressive webapp Lemmy client",
  "private": true,
- "version": "2.18.0",
+ "version": "2.18.1",
  "type": "module",
  "packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e",
  "scripts": {

src/features/settings/blocks/BlockedCommunities.tsx

@@ -35,8 +35,9 @@ export default function BlockedCommunities() {
  );
 
  const sortedCommunities = communities
+ ?.map(getCommunity)
  ?.slice()
- .sort((a, b) => getCommunity(a).name.localeCompare(getCommunity(b).name));
+ .sort((a, b) => a.name.localeCompare(b.name));
 
  async function remove(community: Community) {
  setLoading(true);

src/features/settings/blocks/BlockedInstances.tsx

@@ -57,8 +57,9 @@ export default function BlockedInstances() {
  );
 
  const sortedInstances = instances
+ ?.map(getInstance)
  ?.slice()
- .sort((a, b) => getInstance(a).domain.localeCompare(getInstance(b).domain));
+ .sort((a, b) => a.domain.localeCompare(b.domain));
 
  async function remove(instanceBlock: Instance) {
  setLoading(true);

src/features/settings/blocks/BlockedUsers.tsx

@@ -40,8 +40,9 @@ export default function BlockedUsers() {
  );
 
  const sortedUsers = users
+ ?.map(getPerson)
  ?.slice()
- .sort((a, b) => getPerson(a).name.localeCompare(getPerson(b).name));
+ .sort((a, b) => a.name.localeCompare(b.name));
 
  async function remove(user: Person) {
  setLoading(true);