Merge branch 'develop' into feat/scroll-into-article

thematters · Dec 16, 2024 · 673ba5b · 673ba5b
2 parents fad39ae + 2be7aa2
commit 673ba5b
Show file tree

Hide file tree

Showing 102 changed files with 2,071 additions and 947 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -31,6 +31,19 @@ jobs:
           node-version: '18'
           cache: 'npm'
 
+      - name: Setup rclone
+        if: github.base_ref == 'develop' || github.base_ref == 'master'
+        uses: AnimMouse/setup-rclone@v1
+        with:
+          rclone_config: |
+            [r2]
+            type = s3
+            provider = Cloudflare
+            access_key_id = ${{ secrets.RCLONE_CONFIG_R2_ACCESS_KEY_ID }}
+            secret_access_key = ${{ secrets.RCLONE_CONFIG_R2_SECRET_ACCESS_KEY }}
+            endpoint = ${{ secrets.RCLONE_CONFIG_R2_ENDPOINT }}
+          disable_base64: true
+
       - name: Install Dependencies
         run: npm ci
 
@@ -84,15 +97,7 @@ jobs:
 
       - name: Upload Assets (develop - R2)
         if: github.base_ref == 'develop'
-        uses: andreiio/rclone-action@v1
-        env:
-          RCLONE_CONFIG_R2_TYPE: s3
-          RCLONE_CONFIG_R2_PROVIDER: Cloudflare
-          RCLONE_CONFIG_R2_ACCESS_KEY_ID: ${{ secrets.RCLONE_CONFIG_R2_ACCESS_KEY_ID }}
-          RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.RCLONE_CONFIG_R2_SECRET_ACCESS_KEY }}
-          RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.RCLONE_CONFIG_R2_ENDPOINT }}
-        with:
-          args: sync .next/static r2:matters-assets-next-develop/_next/static -P
+        run: rclone sync .next/static r2:matters-assets-next-develop/_next/static -P
 
       - name: Deploy to EB (develop)
         if: github.base_ref == 'develop'
@@ -111,15 +116,7 @@ jobs:
 
       - name: Upload Assets (production - R2)
         if: github.base_ref == 'master'
-        uses: andreiio/rclone-action@v1
-        env:
-          RCLONE_CONFIG_R2_TYPE: s3
-          RCLONE_CONFIG_R2_PROVIDER: Cloudflare
-          RCLONE_CONFIG_R2_ACCESS_KEY_ID: ${{ secrets.RCLONE_CONFIG_R2_ACCESS_KEY_ID }}
-          RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.RCLONE_CONFIG_R2_SECRET_ACCESS_KEY }}
-          RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.RCLONE_CONFIG_R2_ENDPOINT }}
-        with:
-          args: sync .next/static r2:matters-assets-next/_next/static -P
+        run: rclone sync .next/static r2:matters-assets-next/_next/static -P
 
       - name: Deploy to EB (production)
         if: github.base_ref == 'master'

diff --git a/lang/default.json b/lang/default.json
@@ -49,6 +49,10 @@
   "+ixiPI": {
     "defaultMessage": "Delete moment"
   },
+  "+jt4rV": {
+    "defaultMessage": "Claim USDT support",
+    "description": "src/components/Transaction/index.tsx"
+  },
   "+o9W2T": {
     "defaultMessage": "File upload failed, please verify the file link is valid, or manually download and upload again.",
     "description": "UNABLE_TO_UPLOAD_FROM_URL"
@@ -134,9 +138,6 @@
     "defaultMessage": "Matters ID has been set up. More account info can be found in Settings",
     "description": "src/components/Dialogs/SetUserNameDialog/ConfirmStep.tsx"
   },
-  "0HdNPs": {
-    "defaultMessage": "{link1}: In order to increase the sources of income for creators, Matters introduced {link2} and {link3}, enabling the payer and the payee to conduct transactions in different currencies. Through {link4}, and other services you can acqure a {link6}, and receive payments from {link7}, applicable on both Matters website and IPFS."
-  },
   "0JlaP1": {
     "defaultMessage": "Oops！This link has expired",
     "description": "src/views/Callback/UI.tsx"
@@ -274,6 +275,9 @@
     "defaultMessage": "Disconnect",
     "description": "src/components/Dialogs/RemoveSocialLoginDialog/Content.tsx"
   },
+  "2Sgvfr": {
+    "defaultMessage": "USDT {amount} pending claim"
+  },
   "2W0f9h": {
     "defaultMessage": "Bio"
   },
@@ -389,9 +393,6 @@
   "4nHH2x": {
     "defaultMessage": "Applied successfully"
   },
-  "4tqFCR": {
-    "defaultMessage": "The author has not bound the USDT wallet yet"
-  },
   "4wOWfp": {
     "defaultMessage": "What's this?",
     "description": "src/components/Billboard/index.tsx"
@@ -479,6 +480,9 @@
   "6BbPcY": {
     "defaultMessage": "The comment has been forcibly hidden"
   },
+  "6Bxl4S": {
+    "defaultMessage": "Claim {amount} USDT failed. Click here to retry or contact [email protected]"
+  },
   "6CQaLH": {
     "defaultMessage": "Please select or enter amount"
   },
@@ -503,6 +507,9 @@
     "defaultMessage": "subscribers_empty",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
+  "6Sj2lN": {
+    "defaultMessage": "Claim"
+  },
   "6Vznnt": {
     "defaultMessage": "left a comment in your circle",
     "description": "src/components/Notice/CircleNotice/CircleNewDiscussionComments.tsx"
@@ -702,6 +709,10 @@
   "9Vkz9W": {
     "defaultMessage": "Maximum image area is limited to 100 megapixels (for example, 10,000×10,000 pixels)."
   },
+  "9WMs5q": {
+    "defaultMessage": "Connect",
+    "description": "src/views/Me/Wallet/Balance"
+  },
   "9WRlF4": {
     "defaultMessage": "Send"
   },
@@ -843,6 +854,9 @@
     "defaultMessage": "Provide support funds to",
     "description": "src/components/Forms/PaymentForm/PaymentInfo/index.tsx"
   },
+  "C/4nS6": {
+    "defaultMessage": "Connect and claim"
+  },
   "C3NKBg": {
     "defaultMessage": "Connected to {type}",
     "description": "src/views/Me/Settings/Settings/Socials/index.tsx"
@@ -872,6 +886,12 @@
     "defaultMessage": "Copy comment",
     "description": "src/components/Comment/DropdownActions/index.tsx"
   },
+  "CcVXhc": {
+    "defaultMessage": "Matters is sending {amount} to your connected wallet {address} via a contract transaction (Matters will temporarily cover the transaction fee). For assistance, please contact [email protected]"
+  },
+  "CgPGAu": {
+    "defaultMessage": ", connect your wallet to claim"
+  },
   "Ci7dxf": {
     "defaultMessage": "Comment deleted",
     "description": "src/components/Notice/NoticeComment.tsx/moment"
@@ -1133,6 +1153,9 @@
   "HAlOn1": {
     "defaultMessage": "Name"
   },
+  "HBdVkS": {
+    "defaultMessage": "Claiming in progress"
+  },
   "HBxXD/": {
     "defaultMessage": "License"
   },
@@ -1143,6 +1166,9 @@
   "HJ0iZJ": {
     "defaultMessage": "Confirm Archiving"
   },
+  "HJsl78": {
+    "defaultMessage": "An issue occurred while claiming USDT. Please retry or contact [email protected]"
+  },
   "HPVOw/": {
     "defaultMessage": "Wallet",
     "description": "src/views/Me/Settings/Settings/index.tsx"
@@ -1232,9 +1258,6 @@
   "IpMWC4": {
     "defaultMessage": "You’ve posted several times in a short period. Please take a break."
   },
-  "Is5PqP": {
-    "defaultMessage": "Interledger Protocol"
-  },
   "ItUuuX": {
     "defaultMessage": "invites you to join the circle {circleName} , and you can experience it for {freePeriod} days for free",
     "description": "src/components/Notice/CircleNotice/CircleInvitationNotice.tsx"
@@ -1385,9 +1408,6 @@
     "defaultMessage": "Article published",
     "description": "src/views/Me/DraftDetail/PublishState/PublishedState.tsx"
   },
-  "LklXfd": {
-    "defaultMessage": "Payment Pointer"
-  },
   "LmiUWG": {
     "defaultMessage": "You do not have permissionn to perform this operation",
     "description": "FORBIDDEN_BY_TARGET_STATE"
@@ -1518,6 +1538,9 @@
   "O7ozeo": {
     "defaultMessage": "Update profile"
   },
+  "ODncRd": {
+    "defaultMessage": "Claiming..."
+  },
   "OIj8pQ": {
     "defaultMessage": "Invitation Sent",
     "description": "src/views/Circle/Settings/ManageInvitation/AddInvitationDialog/Sent.tsx"
@@ -1955,16 +1978,10 @@
   "WQT8ZA": {
     "defaultMessage": "Edit collection"
   },
-  "WiGHyF": {
-    "defaultMessage": "Web Monetization standard"
-  },
   "WpvsPu": {
     "defaultMessage": "Subscribe",
     "description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
   },
-  "WrQjnc": {
-    "defaultMessage": "Payment pointer updated"
-  },
   "WsPbZT": {
     "defaultMessage": "Continue payout"
   },
@@ -1989,6 +2006,10 @@
   "XOEFDf": {
     "defaultMessage": "{total} articles"
   },
+  "XQ9bi3": {
+    "defaultMessage": "More",
+    "description": "src/components/Dialogs/WithdrawVaultUSDTDialog/Content.tsx"
+  },
   "XQTBu6": {
     "defaultMessage": "mentioned you in your circle broadcast comment",
     "description": "src/components/Notice/CircleNotice/CircleNewBroadcastComments.tsx"
@@ -2321,6 +2342,9 @@
     "defaultMessage": "No blocked users yet",
     "description": "src/views/Me/Settings/Blocked/SettingsBlocked.tsx"
   },
+  "dK7Dnj": {
+    "defaultMessage": "🔥 Claim for free"
+  },
   "dQhNbF": {
     "defaultMessage": "Payment will be processed by Stripe, allowing your support to be unrestricted by region.",
     "description": "src/components/Forms/PaymentForm/StripeCheckout/index.tsx"
@@ -2332,6 +2356,9 @@
   "dTOtPO": {
     "defaultMessage": "Top Up"
   },
+  "dUkC8R": {
+    "defaultMessage": "Claim USDT"
+  },
   "dVbKzB": {
     "defaultMessage": "Comments and replies",
     "description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx"
@@ -2435,6 +2462,9 @@
     "defaultMessage": "Pending",
     "description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
   },
+  "fko+MR": {
+    "defaultMessage": "Retry claiming"
+  },
   "fnv5rD": {
     "defaultMessage": "like article (current {total} likes)"
   },
@@ -2512,6 +2542,9 @@
   "hBLCwn": {
     "defaultMessage": "other amount"
   },
+  "hDDFgp": {
+    "defaultMessage": "Matters will send {amount} to your connected wallet {address} via a contract transaction (Matters will temporarily cover the transaction fee). For assistance, please contact [email protected]"
+  },
   "hG2cBH": {
     "defaultMessage": "Subscribe Circle"
   },
@@ -2544,9 +2577,6 @@
   "i4OBEw": {
     "defaultMessage": "\"{name}\" is invalid."
   },
-  "i7cXnf": {
-    "defaultMessage": "The wallet address starts with \"$\"."
-  },
   "iEJeQH": {
     "defaultMessage": "Liker ID"
   },
@@ -2769,6 +2799,10 @@
   "mBkZcw": {
     "defaultMessage": "Like moment"
   },
+  "mBmmr+": {
+    "defaultMessage": "Subscribed",
+    "description": "src/views/User/UserProfile/FollowingDialog/CirclesFeed/CirclesTabs/index.tsx"
+  },
   "mCAIcg": {
     "defaultMessage": "Hottest",
     "description": "src/views/Circle/Analytics/ContentAnalytics/index.tsx"
@@ -2803,6 +2837,9 @@
   "ml3SZN": {
     "defaultMessage": "Minimum 8 characters. Uppercase/lowercase letters, numbers and symbols are allowed"
   },
+  "mm2UAM": {
+    "defaultMessage": "Connect wallet and claim USDT"
+  },
   "mp9SBo": {
     "defaultMessage": "Circle notifications",
     "description": "src/views/Me/Settings/Notifications/index.tsx"
@@ -2830,6 +2867,9 @@
     "defaultMessage": "My profile",
     "description": "src/views/Me/Settings/Settings/MyProfile/index.tsx"
   },
+  "n3SsO1": {
+    "defaultMessage": "The contract has sent {amount} to the linked wallet. Click here for details."
+  },
   "n3shsQ": {
     "defaultMessage": "Invalid name",
     "description": "NAME_INVALID"
@@ -2845,6 +2885,10 @@
     "defaultMessage": "replied your comment in",
     "description": "src/components/Notice/CommentCommentNotice/CommentNewReplyNotice.tsx"
   },
+  "nVoVnb": {
+    "defaultMessage": "Followed",
+    "description": "src/views/User/UserProfile/FollowingDialog/CirclesFeed/CirclesTabs/index.tsx"
+  },
   "nWhqw9": {
     "defaultMessage": "Publish Now"
   },
@@ -2890,9 +2934,6 @@
     "defaultMessage": "liked",
     "description": "src/components/Notice/ArticleNotice/ArticleNewAppreciationNotice.tsx"
   },
-  "p6D+Uc": {
-    "defaultMessage": "Enter Payment Pointer"
-  },
   "p9gEZh": {
     "defaultMessage": "Up to 3 images can be uploaded"
   },
@@ -3002,12 +3043,18 @@
     "defaultMessage": "Unavailable",
     "description": "FORBIDDEN_BY_STATE"
   },
+  "rAFb3E": {
+    "defaultMessage": "Matters will send {amount} to your connected wallet via a contract transaction (Matters will temporarily cover the transaction fee)."
+  },
   "rDX3h6": {
     "defaultMessage": "Version Description"
   },
   "rE7sE3": {
     "defaultMessage": "CC0 License"
   },
+  "rG2xmp": {
+    "defaultMessage": "Claim successful"
+  },
   "rHi+cL": {
     "defaultMessage": "Most readers",
     "description": "src/views/Me/Works/Published/SortTabs.tsx"
@@ -3252,9 +3299,6 @@
     "defaultMessage": "reset your login password",
     "description": "src/components/Dialogs/SetEmailDialog/Content.tsx"
   },
-  "vyG38g": {
-    "defaultMessage": "wallet address"
-  },
   "w+6UiO": {
     "defaultMessage": "Add Invitation"
   },