Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(donation): prompt to reapprove if exceeded allowance #4205

Merged
merged 2 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions lang/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"+aMAeT": {
"defaultMessage": "Address copied"
},
"+bwe8v": {
"defaultMessage": "Stripe will process your payment, so you can support the author wherever you are."
},
"+cS08C": {
"defaultMessage": "Are you sure you want to remove ‘{article}’ from this collection?",
"description": "src/components/Dialogs/RemoveArticleCollectionDialog/index.tsx"
Expand Down Expand Up @@ -229,6 +232,9 @@
"3kbIhS": {
"defaultMessage": "Untitled"
},
"3lMsOU": {
"defaultMessage": "Reapprove to continue"
},
"3phEFL": {
"defaultMessage": "Continued use indicates your agreement to",
"description": "src/components/Forms/SelectAuthMethodForm/NormalFeed.tsx"
Expand Down Expand Up @@ -319,6 +325,9 @@
"defaultMessage": "Set threshold for circle (per month)",
"description": "src/components/Forms/CreateCircleForm/Init.tsx"
},
"6ErzDk": {
"defaultMessage": "Reconnect Wallet"
},
"6N2LKY": {
"defaultMessage": "Please log in again.",
"description": "OAUTH_TOKEN_INVALID"
Expand Down Expand Up @@ -828,6 +837,9 @@
"defaultMessage": "New followers",
"description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx"
},
"JmzmVH": {
"defaultMessage": "Switch to"
},
"JpS59y": {
"defaultMessage": "Accepted",
"description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
Expand Down Expand Up @@ -1160,6 +1172,9 @@
"defaultMessage": "Subscribers",
"description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
},
"Tgd5id": {
"defaultMessage": "Transfer amount exceeds allowance"
},
"TjWWxF": {
"defaultMessage": "Broadcast sent",
"description": "src/views/Circle/Broadcast/Broadcast.tsx"
Expand Down Expand Up @@ -1426,6 +1441,9 @@
"ai7kS4": {
"defaultMessage": "My Works"
},
"aoDcrD": {
"defaultMessage": "Approve to continue"
},
"aqX2Bt": {
"defaultMessage": "go to the homepage",
"description": "src/views/Callback/UI.tsx"
Expand Down Expand Up @@ -1883,6 +1901,9 @@
"defaultMessage": "Set password succeed",
"description": "src/components/Dialogs/SetPasswordDialog/Content.tsx"
},
"pKkpI9": {
"defaultMessage": "The wallet address is not the one you bound to account. Please switch it in the wallet or reconnect as:"
},
"pRV+UD": {
"defaultMessage": "Collapse",
"description": "src/components/Comment/DropdownActions/CollapseComment/Button.tsx"
Expand Down
21 changes: 21 additions & 0 deletions lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"+aMAeT": {
"defaultMessage": "Address copied"
},
"+bwe8v": {
"defaultMessage": "Stripe will process your payment, so you can support the author wherever you are."
},
"+cS08C": {
"defaultMessage": "Are you sure you want to remove ‘{article}’ from this collection?",
"description": "src/components/Dialogs/RemoveArticleCollectionDialog/index.tsx"
Expand Down Expand Up @@ -229,6 +232,9 @@
"3kbIhS": {
"defaultMessage": "Untitled"
},
"3lMsOU": {
"defaultMessage": "Reapprove to continue"
},
"3phEFL": {
"defaultMessage": "Continued use indicates your agreement to ",
"description": "src/components/Forms/SelectAuthMethodForm/NormalFeed.tsx"
Expand Down Expand Up @@ -319,6 +325,9 @@
"defaultMessage": "Set threshold for circle (per month)",
"description": "src/components/Forms/CreateCircleForm/Init.tsx"
},
"6ErzDk": {
"defaultMessage": "Reconnect Wallet"
},
"6N2LKY": {
"defaultMessage": "Please log in again.",
"description": "OAUTH_TOKEN_INVALID"
Expand Down Expand Up @@ -828,6 +837,9 @@
"defaultMessage": "New followers",
"description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx"
},
"JmzmVH": {
"defaultMessage": "Switch to "
},
"JpS59y": {
"defaultMessage": "Accepted",
"description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
Expand Down Expand Up @@ -1160,6 +1172,9 @@
"defaultMessage": "Subscribers",
"description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
},
"Tgd5id": {
"defaultMessage": "Transfer amount exceeds allowance"
},
"TjWWxF": {
"defaultMessage": "Broadcast sent",
"description": "src/views/Circle/Broadcast/Broadcast.tsx"
Expand Down Expand Up @@ -1426,6 +1441,9 @@
"ai7kS4": {
"defaultMessage": "My Works"
},
"aoDcrD": {
"defaultMessage": "Approve to continue"
},
"aqX2Bt": {
"defaultMessage": "go to the homepage",
"description": "src/views/Callback/UI.tsx"
Expand Down Expand Up @@ -1883,6 +1901,9 @@
"defaultMessage": "Set password succeed",
"description": "src/components/Dialogs/SetPasswordDialog/Content.tsx"
},
"pKkpI9": {
"defaultMessage": "The wallet address is not the one you bound to account. Please switch it in the wallet or reconnect as:"
},
"pRV+UD": {
"defaultMessage": "Collapse",
"description": "src/components/Comment/DropdownActions/CollapseComment/Button.tsx"
Expand Down
21 changes: 21 additions & 0 deletions lang/zh-Hans.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"+aMAeT": {
"defaultMessage": "地址已复制"
},
"+bwe8v": {
"defaultMessage": "Stripe will process your payment, so you can support the author wherever you are."
},
"+cS08C": {
"defaultMessage": "确认要将“{article}”从选集中移出吗?",
"description": "src/components/Dialogs/RemoveArticleCollectionDialog/index.tsx"
Expand Down Expand Up @@ -229,6 +232,9 @@
"3kbIhS": {
"defaultMessage": "未命名"
},
"3lMsOU": {
"defaultMessage": "重新授权后继续"
},
"3phEFL": {
"defaultMessage": "继续使用表示您同意",
"description": "src/components/Forms/SelectAuthMethodForm/NormalFeed.tsx"
Expand Down Expand Up @@ -319,6 +325,9 @@
"defaultMessage": "设定围炉门槛(每月)",
"description": "src/components/Forms/CreateCircleForm/Init.tsx"
},
"6ErzDk": {
"defaultMessage": "重新连接钱包"
},
"6N2LKY": {
"defaultMessage": "授权信息已失效,请重新登入",
"description": "OAUTH_TOKEN_INVALID"
Expand Down Expand Up @@ -828,6 +837,9 @@
"defaultMessage": "被追踪",
"description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx"
},
"JmzmVH": {
"defaultMessage": "切换到 "
},
"JpS59y": {
"defaultMessage": "已接受",
"description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
Expand Down Expand Up @@ -1160,6 +1172,9 @@
"defaultMessage": "付费人数",
"description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
},
"Tgd5id": {
"defaultMessage": "支持金额超出授权额度"
},
"TjWWxF": {
"defaultMessage": "广播已送出",
"description": "src/views/Circle/Broadcast/Broadcast.tsx"
Expand Down Expand Up @@ -1426,6 +1441,9 @@
"ai7kS4": {
"defaultMessage": "我的创作"
},
"aoDcrD": {
"defaultMessage": "首次需确认授权后继续"
},
"aqX2Bt": {
"defaultMessage": "前往首页",
"description": "src/views/Callback/UI.tsx"
Expand Down Expand Up @@ -1883,6 +1901,9 @@
"defaultMessage": "登录密码已设置",
"description": "src/components/Dialogs/SetPasswordDialog/Content.tsx"
},
"pKkpI9": {
"defaultMessage": "The wallet address is not the one you bound to account. Please switch it in the wallet or reconnect as:"
},
"pRV+UD": {
"defaultMessage": "折叠",
"description": "src/components/Comment/DropdownActions/CollapseComment/Button.tsx"
Expand Down
21 changes: 21 additions & 0 deletions lang/zh-Hant.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@
"+aMAeT": {
"defaultMessage": "地址已複製"
},
"+bwe8v": {
"defaultMessage": "Stripe will process your payment, so you can support the author wherever you are."
},
"+cS08C": {
"defaultMessage": "確認要將「{article}」從選集中移出嗎?",
"description": "src/components/Dialogs/RemoveArticleCollectionDialog/index.tsx"
Expand Down Expand Up @@ -229,6 +232,9 @@
"3kbIhS": {
"defaultMessage": "未命名"
},
"3lMsOU": {
"defaultMessage": "重新授權後繼續"
},
"3phEFL": {
"defaultMessage": "繼續使用表示您同意",
"description": "src/components/Forms/SelectAuthMethodForm/NormalFeed.tsx"
Expand Down Expand Up @@ -319,6 +325,9 @@
"defaultMessage": "設定圍爐門檻(每月)",
"description": "src/components/Forms/CreateCircleForm/Init.tsx"
},
"6ErzDk": {
"defaultMessage": "重新連接錢包"
},
"6N2LKY": {
"defaultMessage": "授權信息已失效,請重新登入",
"description": "OAUTH_TOKEN_INVALID"
Expand Down Expand Up @@ -828,6 +837,9 @@
"defaultMessage": "被追蹤",
"description": "src/views/Me/Settings/Notifications/GeneralSettings/index.tsx"
},
"JmzmVH": {
"defaultMessage": "切換到 "
},
"JpS59y": {
"defaultMessage": "已接受",
"description": "src/views/Circle/Settings/ManageInvitation/Invites/index.tsx"
Expand Down Expand Up @@ -1160,6 +1172,9 @@
"defaultMessage": "付費人數",
"description": "src/views/Circle/Analytics/SubscriberAnalytics/index.tsx"
},
"Tgd5id": {
"defaultMessage": "支持金額超出授權額度"
},
"TjWWxF": {
"defaultMessage": "廣播已送出",
"description": "src/views/Circle/Broadcast/Broadcast.tsx"
Expand Down Expand Up @@ -1426,6 +1441,9 @@
"ai7kS4": {
"defaultMessage": "我的創作"
},
"aoDcrD": {
"defaultMessage": "首次需確認授權後繼續"
},
"aqX2Bt": {
"defaultMessage": "前往首頁",
"description": "src/views/Callback/UI.tsx"
Expand Down Expand Up @@ -1883,6 +1901,9 @@
"defaultMessage": "登入密碼已設定",
"description": "src/components/Dialogs/SetPasswordDialog/Content.tsx"
},
"pKkpI9": {
"defaultMessage": "The wallet address is not the one you bound to account. Please switch it in the wallet or reconnect as:"
},
"pRV+UD": {
"defaultMessage": "闔上",
"description": "src/components/Comment/DropdownActions/CollapseComment/Button.tsx"
Expand Down
6 changes: 0 additions & 6 deletions src/common/enums/text.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ export const TEXT = {
readCount: '閱讀次數',
readHistory: '瀏覽記錄',
readTime: '累計閱讀時數',
reconnectHint:
'當前錢包地址與帳戶綁定不同,若要變更請直接操作錢包或重新連接為:',
refund: '退款',
refuse: '拒絕',
register: '註冊',
Expand Down Expand Up @@ -339,8 +337,6 @@ export const TEXT = {
readCount: '阅读次数',
readHistory: '浏览记录',
readTime: '累计阅读时数',
reconnectHint:
'当前钱包地址与帐户绑定不同,若要变更请直接操作钱包或重新连接为:',
refund: '退款',
refuse: '拒绝',
register: '注册',
Expand Down Expand Up @@ -572,8 +568,6 @@ export const TEXT = {
readCount: 'Read Counts',
readHistory: 'Read History',
readTime: 'Accumulated Read Time',
reconnectHint:
'The wallet address is not the one you bound to account. Please switch it in the wallet or reconnect as: ',
refund: 'Refund',
refuse: 'Decline',
register: 'Register',
Expand Down
5 changes: 4 additions & 1 deletion src/components/Dialogs/ENSDialog/LinkENS.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,10 @@ const LinkENS = ({
<LinkENSIntro ensName={ensName} />

<p className={styles.error}>
<Translate id="reconnectHint" />
<FormattedMessage
defaultMessage="The wallet address is not the one you bound to account. Please switch it in the wallet or reconnect as: "
id="pKkpI9"
/>
<CopyToClipboard
text={viewer.info.ethAddress || ''}
successMessage={
Expand Down
Loading
Loading