Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
xmflsct committed May 20, 2023
2 parents 7fc8e96 + 1375bc9 commit f0cf9b9
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 26 deletions.
3 changes: 1 addition & 2 deletions fastlane/metadata/en-US/release_notes.txt
@@ -1,3 +1,2 @@
Enjoy toooting! This version includes following improvements and fixes:
- Long press avatar in tab bar to quickly switch to another account
- Fix poll notifications wrongly greyed out
- Fixed functionality version check (e.g. cannot edit own toots)
3 changes: 1 addition & 2 deletions fastlane/metadata/zh-Hans/release_notes.txt
@@ -1,3 +1,2 @@
tooot-ing愉快!此版本包括以下改进和修复:
- 长按底部菜单头像快速切换账户
- 修复投票通知显示
- 修复版本功能检查(如无法编辑嘟文)
4 changes: 2 additions & 2 deletions ios/Podfile.lock
Expand Up @@ -454,7 +454,7 @@ PODS:
- React-Core
- RNCClipboard (1.11.2):
- React-Core
- RNGestureHandler (2.10.0):
- RNGestureHandler (2.10.1):
- React-Core
- RNReanimated (3.1.0):
- DoubleConversion
Expand Down Expand Up @@ -832,7 +832,7 @@ SPEC CHECKSUMS:
ReactCommon: 85c98ab0a509e70bf5ee5d9715cf68dbf495b84c
RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b
RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
RNGestureHandler: e145476da655f3dbc48ef2f0a08cf7a34338c02b
RNGestureHandler: 42ec7c28dd02d540ed6c9159c57a98ff016492dc
RNReanimated: b1220a0e5168745283ff5d53bfc7d2144b2cee1b
RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f
RNSentry: 4fb2cd7d2d6cb94423c24884488206ef881da136
Expand Down
8 changes: 4 additions & 4 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "tooot",
"version": "4.9.5",
"version": "4.9.6",
"description": "tooot for Mastodon",
"author": "xmflsct <[email protected]>",
"license": "GPL-3.0-or-later",
Expand Down Expand Up @@ -63,16 +63,16 @@
"expo-video-thumbnails": "^7.3.0",
"expo-web-browser": "~12.1.1",
"htmlparser2": "^9.0.0",
"i18next": "^22.4.15",
"i18next": "^22.5.0",
"linkify-it": "^4.0.1",
"lodash": "^4.17.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-i18next": "^12.2.2",
"react-i18next": "^12.3.1",
"react-intl": "^6.4.2",
"react-native": "^0.71.8",
"react-native-flash-message": "^0.4.1",
"react-native-gesture-handler": "~2.10.0",
"react-native-gesture-handler": "~2.10.1",
"react-native-image-picker": "^5.3.1",
"react-native-ios-context-menu": "^1.15.3",
"react-native-language-detection": "^0.2.2",
Expand Down
2 changes: 1 addition & 1 deletion src/utils/helpers/featureCheck.ts
Expand Up @@ -34,7 +34,7 @@ const features: { feature: Features; version: number }[] = [
]

export const featureCheck = (feature: Features, v?: string): boolean =>
v
v || getAccountStorage.string('version')
? (features.find(f => f.feature === feature)?.version || 999) <=
parseFloat(v || getAccountStorage.string('version'))
: false
30 changes: 15 additions & 15 deletions yarn.lock
Expand Up @@ -6756,12 +6756,12 @@ __metadata:
languageName: node
linkType: hard

"i18next@npm:^22.4.15":
version: 22.4.15
resolution: "i18next@npm:22.4.15"
"i18next@npm:^22.5.0":
version: 22.5.0
resolution: "i18next@npm:22.5.0"
dependencies:
"@babel/runtime": ^7.20.6
checksum: fced898227983e439c59e7aa6e7b87e53ad1b8a1c85f0613a968881418266e5336e9443831125590559796075d516fe3dbf8118679c894094a0a404be78b02a2
checksum: 291c0e02fda20bd1827b6529dad74c01867892c7ac000befe0f69e10ad97ab074a2ae5b4ce1e0638c28ae1a6f59d1ed8503ea05bd1c324d731a44dd94c43a49a
languageName: node
linkType: hard

Expand Down Expand Up @@ -9487,9 +9487,9 @@ __metadata:
languageName: node
linkType: hard

"react-i18next@npm:^12.2.2":
version: 12.2.2
resolution: "react-i18next@npm:12.2.2"
"react-i18next@npm:^12.3.1":
version: 12.3.1
resolution: "react-i18next@npm:12.3.1"
dependencies:
"@babel/runtime": ^7.20.6
html-parse-stringify: ^3.0.1
Expand All @@ -9501,7 +9501,7 @@ __metadata:
optional: true
react-native:
optional: true
checksum: 460e32779f6abba287d63be6054f855202c2e365cbceca36673c8f37a497c2ac5a21a8577d20fcc0b3fcd4825f89427dc4fdf00136365963d27dac7d997c3c74
checksum: fe3f360e5184bc63861734e94bf625a09b9ec0d28fab41779a68758af258fd1737dde25ff7a88ddb66c1571a3e3de5b3403825a91b4949bf9832a00615acb87a
languageName: node
linkType: hard

Expand Down Expand Up @@ -9585,9 +9585,9 @@ __metadata:
languageName: node
linkType: hard

"react-native-gesture-handler@npm:~2.10.0":
version: 2.10.0
resolution: "react-native-gesture-handler@npm:2.10.0"
"react-native-gesture-handler@npm:~2.10.1":
version: 2.10.1
resolution: "react-native-gesture-handler@npm:2.10.1"
dependencies:
"@egjs/hammerjs": ^2.0.17
hoist-non-react-statics: ^3.3.0
Expand All @@ -9597,7 +9597,7 @@ __metadata:
peerDependencies:
react: "*"
react-native: "*"
checksum: 7bfde740a67e551458228ad9076af511ad3538c5e65598fc0aef0fdb7329c1743501e31d46ad64fc42697132e3f39721da45d044ad38c6049415b2ede79b13e8
checksum: 8770c6590aca1947957aefc1979bae7263cac1814fd087f5d7c6f3ed0f8a0acda85136421fee814e4d8ec86a973190b206136a8e0e90659488f569373d3af117
languageName: node
linkType: hard

Expand Down Expand Up @@ -11300,17 +11300,17 @@ __metadata:
expo-video-thumbnails: ^7.3.0
expo-web-browser: ~12.1.1
htmlparser2: ^9.0.0
i18next: ^22.4.15
i18next: ^22.5.0
linkify-it: ^4.0.1
lodash: ^4.17.21
react: ^18.2.0
react-dom: ^18.2.0
react-i18next: ^12.2.2
react-i18next: ^12.3.1
react-intl: ^6.4.2
react-native: ^0.71.8
react-native-clean-project: ^4.0.1
react-native-flash-message: ^0.4.1
react-native-gesture-handler: ~2.10.0
react-native-gesture-handler: ~2.10.1
react-native-image-picker: ^5.3.1
react-native-ios-context-menu: ^1.15.3
react-native-language-detection: ^0.2.2
Expand Down

0 comments on commit f0cf9b9

Please sign in to comment.