Merge remote-tracking branch 'upstream/release/v3.4.0' into release/v…

…3.4.0

.github/workflows/production.yaml

@@ -5,9 +5,9 @@ on:
     inputs:
       release_as:
         description: 'release as'
-        required: false
-      pre-release:
-        description: 'prerelease'
+        required: true
+      custom_version:
+        description: 'custom version'
         required: false
 
 jobs:
@@ -48,12 +48,8 @@ jobs:
         run: pnpm install
 
       - name: increase version (patch)
-        run: pnpm standard-version --yes
-        if: github.event.inputs.release_as == 'patch' && github.event.inputs.pre-release == ''
-
-      - name: increase version (patch) (pre-release)
-        run: pnpm standard-version --yes --release-as patch --prerelease ${{ github.event.inputs.pre-release }}
-        if: github.event.inputs.release_as == 'patch' && github.event.inputs.pre-release != ''
+        run: pnpm standard-version --yes --release-as patch
+        if: github.event.inputs.release_as == 'patch'
 
       - name: increase version (minor)
         run: pnpm standard-version --yes --release-as minor
@@ -75,6 +71,10 @@ jobs:
         run: pnpm standard-version --prerelease ${{ github.event.inputs.pre-release }}
         if: github.event.inputs.release_as == '' && github.event.inputs.pre-release != ''
 
+      - name: increase version (custom)
+        run: pnpm standard-version --yes --release-as ${{ github.event.inputs.custom_version }}
+        if: github.event.inputs.release_as == 'custom'
+
       - name: build
         run: pnpm run build
 

CHANGELOG.md

@@ -2,17 +2,37 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## 4.0.0-beta.1 (2024-04-05)
+## 3.4.0 (2024-04-05)
 
 ### Bug Fixes
 
-- update ts-sdk version ([84204c0](https://github.com/EkoCommunications/AmityUiKitWeb/commit/84204c0194d2421513f20f7ef15aea3e12b09e74))
+- ASC-21481 - remove unnecessary request to prevent rate limit ([#230](https://github.com/EkoCommunications/AmityUiKitWeb/issues/230)) ([b2f2ce1](https://github.com/EkoCommunications/AmityUiKitWeb/commit/b2f2ce116b301f8fe9af124b506050abee1f29d2))
 
-## 4.0.0-beta.0 (2024-03-25)
+## 3.3.0 (2024-03-22)
 
 ### Bug Fixes
 
-- add pre-release condition ([#193](https://github.com/EkoCommunications/AmityUiKitWeb/issues/193)) ([ec9c0ca](https://github.com/EkoCommunications/AmityUiKitWeb/commit/ec9c0cab3c821842fae025ba30b54813e0999103))
+- ASC-21052 - fix undefined runtime error ([#184](https://github.com/EkoCommunications/AmityUiKitWeb/issues/184)) ([2385d3e](https://github.com/EkoCommunications/AmityUiKitWeb/commit/2385d3ec364ea74e4edf59ecffc0db088db7570e))
+
+### 3.2.4 (2024-03-11)
+
+### Bug Fixes
+
+- ASC-20601 - comment with blocked word should show noti ([#154](https://github.com/EkoCommunications/AmityUiKitWeb/issues/154)) ([ba4e3f0](https://github.com/EkoCommunications/AmityUiKitWeb/commit/ba4e3f044f08a3aef4d78910203350661cc59076))
+
+### 3.2.3 (2024-03-01)
+
+### Bug Fixes
+
+- typo ([02875bb](https://github.com/EkoCommunications/AmityUiKitWeb/commit/02875bb8d10f174525424d12a3d69d7d92bf8c98))
+
+### 3.2.1 (2024-02-27)
+
+## 3.2.0 (2024-02-27)
+
+### Features
+
+- ASC-19739 - remove font awesome pro ([#129](https://github.com/EkoCommunications/AmityUiKitWeb/issues/129)) ([f7b35bc](https://github.com/EkoCommunications/AmityUiKitWeb/commit/f7b35bcb75fab8457aa5fd41ed31c6ea8b03487f)), closes [#127](https://github.com/EkoCommunications/AmityUiKitWeb/issues/127) [#118](https://github.com/EkoCommunications/AmityUiKitWeb/issues/118) [#116](https://github.com/EkoCommunications/AmityUiKitWeb/issues/116) [#128](https://github.com/EkoCommunications/AmityUiKitWeb/issues/128) [#123](https://github.com/EkoCommunications/AmityUiKitWeb/issues/123) [#142](https://github.com/EkoCommunications/AmityUiKitWeb/issues/142)
 
 ## 3.1.0 (2024-01-25)
 

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@amityco/ui-kit",
-  "version": "4.0.0-beta.1",
+  "name": "@amityco/ui-kit-open-source",
+  "version": "3.4.0",
   "engines": {
     "node": ">=16",
     "pnpm": ">=8"
@@ -111,11 +111,9 @@
     "polished": "^4.3.1",
     "react-hook-form": "^7.49.2",
     "react-infinite-scroll-component": "^6.1.0",
-    "react-insta-stories": "^2.6.2",
     "react-intl": "^6.5.5",
     "react-loading-skeleton": "^3.3.1",
     "react-mentions": "^4.4.10",
-    "react-modal-sheet": "^2.2.0",
     "react-sizeme": "^3.0.2",
     "react-textarea-autosize": "^8.5.3",
     "react-timeago": "^7.2.0",

src/core/providers/UiKitProvider/index.tsx

@@ -31,7 +31,6 @@ interface UiKitProviderProps {
     http?: string;
     mqtt?: string;
   };
-  authToken?: string;
   userId: string;
   displayName: string;
   customComponents?: CustomComponentType;
@@ -56,13 +55,13 @@ interface UiKitProviderProps {
   onConnectionStatusChange?: (state: Amity.SessionStates) => void;
   onConnected?: () => void;
   onDisconnected?: () => void;
+  getAuthToken?: () => Promise<string>;
 }
 
 const UiKitProvider = ({
   apiKey,
   apiRegion,
   apiEndpoint,
-  authToken,
   userId,
   displayName,
   customComponents = {},
@@ -74,6 +73,7 @@ const UiKitProvider = ({
   pageBehavior,
   onConnectionStatusChange,
   onDisconnected,
+  getAuthToken,
 }: UiKitProviderProps) => {
   const queryClient = new QueryClient();
   const [isConnected, setIsConnected] = useState(false);
@@ -103,21 +103,6 @@ const UiKitProvider = ({
       setClient(ascClient);
     }
 
-    await ASCClient.login(
-      { userId, displayName, authToken },
-      {
-        sessionWillRenewAccessToken(renewal) {
-          // secure mode
-          if (authToken) {
-            renewal.renewWithAuthToken(authToken);
-            return;
-          }
-
-          renewal.renew();
-        },
-      },
-    );
-
     setIsConnected(true);
 
     if (stateChangeRef.current == null) {

src/i18n/en.json

@@ -92,15 +92,10 @@
   "UserFeed.tabs.timeline": "Timeline",
   "community.exploreCommunities": "Explore Community",
   "community.permissions.postReview": "Post review",
-  "community.permissions.storyComments": "Story comments",
   "community.permissions.approvePosts": "Approve member posts",
-  "community.permissions.allowStoryComments": "Allow comments on community stories",
   "community.permissions.approvePosts.prompt": "Posts by members have to be reviewed and approved by community moderator.",
-  "community.permissions.storyComments.prompt": "Turn on to receive comments on stories in this community.",
   "community.permissions.error.needApprovalOnPostCreation.turnOn": "Unable to turn on post review",
   "community.permissions.error.needApprovalOnPostCreation.turnOff": "Unable to turn off post review",
-  "community.permissions.error.storyComments.turnOn": "Unable to turn on post review",
-  "community.permissions.error.storyComments.turnOff": "Unable to turn off post review",
   "community.review.declinePendingPosts": "Decline pending post will permanently delete the selected post from community.",
 
   "community.pendingPostsBanner.title": "Pending posts",
@@ -347,41 +342,6 @@
   "pollComposer.overMentionees": "You have reached maximum 30 mentioned users in a post.",
   "pollComposer.okText": "OK",
 
-  "storyCreation.hyperlink.bottomSheet.cancel": "Cancel",
-  "storyCreation.hyperlink.bottomSheet.title": "Add link",
-  "storyCreation.hyperlink.bottomSheet.submit": "Done",
-  "storyCreation.hyperlink.form.urlLabel": "URL",
-  "storyCreation.hyperlink.form.urlPlaceholder": "https://example.com",
-  "storyCreation.hyperlink.form.linkTextLabel": "Customize link text",
-  "storyCreation.hyperlink.form.linkTextPlaceholder": "Name your link",
-  "storyCreation.hyperlink.form.linkTextDescription": "This text will show on the link instead of URL.",
-  "storyCreation.hyperlink.validation.invalidUrl": "Please enter a valid URL.",
-  "storyCreation.hyperlink.form.removeButton": "Remove link",
-  "storyCreation.hyperlink.removeConfirm.title": "Remove link",
-  "storyCreation.hyperlink.removeConfirm.content": "This link will be removed from story.",
-  "storyCreation.hyperlink.removeConfirm.cancel": "Cancel",
-  "storyCreation.hyperlink.removeConfirm.confirm": "Remove",
-  "storyCreation.hyperlink.validation.error.whitelisted": "Please enter a whitelisted URL.",
-  "storyCreation.hyperlink.validation.error.blocked": "Your text contains a blocklisted word.",
-
-  "storyViewer.actions.deleteStory": "Delete story",
-  "storyViewer.action.confirmModal.title": "Delete this story?",
-  "storyViewer.action.confirmModal.content": "This story will be permanently deleted. You’ll no longer to see and find this story.",
-  "storyViewer.notification.deleted": "Story deleted",
-  "storyViewer.notification.success": "Successfully shared story",
-  "storyViewer.notification.error": "Failed to share story",
-  "storyViewer.footer.failed": "Failed to upload",
-  "storyViewer.footer.uploading": "Uploading...",
-  "storyViewer.commentSheet.title": "Comments",
-  "storyViewer.commentSheet.empty": "No comments yet",
-  "storyViewer.commentSheet.disabled": "Comments are disabled for this story",
-  "storyViewer.commentSheet.replyingTo": "Replying to",
-  "storyViewer.toast.like.disabled": "Join community to interact with all stories",
-
-  "storyViewer.commentComposeBar.submit": "Post",
-
-  "storyDraft.button.shareStory": "Share story",
-
   "select.chatType.item": "{answerType} type",
   "chatComposer.label.channelId": "Channel ID",
   "chatComposer.label.displayName": "Display Name",

src/social/components/Comment/index.tsx

@@ -36,8 +36,7 @@ import { CommentRepository } from '@amityco/ts-sdk';
 import { useCustomComponent } from '~/core/providers/CustomComponentsProvider';
 import useCommentFlaggedByMe from '~/social/hooks/useCommentFlaggedByMe';
 import useCommentPermission from '~/social/hooks/useCommentPermission';
-import useCommentSubscription from '~/social/hooks/useCommentSubscription';
-import useStory from '~/social/hooks/useStory';
+import useCommentSubscription from '~/social/hooks/useCommentSubsc
 import { ERROR_RESPONSE } from '~/social/constants';
 
 const REPLIES_PER_PAGE = 5;