Skip to content

Commit 2a027e4

Browse files
guanbinruilelenei
andauthored
[Release] Hotfix 2.21.3 => 2.21.4 (patch) (#10162)
* chore: bump version 2.21.4 * chore: patches/@walletconnect__socket-transport (#10165) * chore: patches/@walletconnect__socket-transport * chore: update lock file * chore: resume Connector * chore: resumeConnector * refactor: improve wc connection (#10168) * refactor: improve wc connection * refactor: destroy connection * refactor: disable v2 * chore: debug * refactor: remove connector * chore: patch wc * refactor: improve stability * refactor: improve connection debugger * fix: lint errors * feat: switch logo plugin (#10178) * feat: switch logo plugin * chore: update lock file * feat: plugin storage * fix: bugfix * refactor: code style * fix: switch logo plugin (#10184) * refactor: code stlye * refactor: code stlye * fix: async * feat: application settings dialog * fix: use legacy settings * fix: typo * fix: type errors --------- Co-authored-by: lelenei <[email protected]> * fix: logo color (#10186) * fix: change twitter logo (#10189) * fix: copywriting (#10187) * fix: adjust ui (#10190) * fix: show switch logo in guidestep (#10191) * fix: icon border (#10193) * fix: copywriting (#10197) * fix: open switch logo (#10201) * fix: add new line to share text (#10203) --------- Co-authored-by: lelenei <[email protected]> Co-authored-by: lelenei <[email protected]>
1 parent 9cb401b commit 2a027e4

File tree

60 files changed

+935
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+935
-133
lines changed

.i18n-codegen.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,18 @@
494494
"trans": "Translate",
495495
"emitTS": true
496496
}
497+
},
498+
{
499+
"input": "./packages/plugins/SwitchLogo/src/locales/en-US.json",
500+
"output": "./packages/plugins/SwitchLogo/src/locales/i18n_generated",
501+
"parser": { "type": "i18next", "contextSeparator": "$", "pluralSeparator": "_" },
502+
"generator": {
503+
"type": "i18next/react-hooks",
504+
"hooks": "useI18N",
505+
"namespace": "io.mask.switch-logo",
506+
"trans": "Translate",
507+
"emitTS": true
508+
}
497509
}
498510
]
499511
}

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"yarn": ">=999.0.0",
99
"npm": ">=999.0.0"
1010
},
11-
"version": "2.21.3",
11+
"version": "2.21.4",
1212
"private": true,
1313
"license": "AGPL-3.0-or-later",
1414
"scripts": {
@@ -153,7 +153,8 @@
153153
154154
"@chainsafe/[email protected]": "patches/@[email protected]",
155155
"@protobufjs/[email protected]": "patches/@[email protected]",
156-
156+
157+
"@walletconnect/[email protected]": "patches/@[email protected]"
157158
}
158159
}
159160
}

packages/app/src/plugin-host/enable.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
createI18NBundle,
99
createKVStorageHost,
1010
i18NextInstance,
11+
SwitchLogoOpenedState,
1112
ValueRefWithReady,
1213
} from '@masknet/shared-base'
1314
import { ChainId } from '@masknet/web3-shared-evm'
@@ -119,6 +120,8 @@ startPluginSNSAdaptor(CurrentSNSNetwork.__SPA__, {
119120
send: reject,
120121
NFTAvatarTimelineUpdated: emptyEventRegistry,
121122
themeSettings: createConstantSubscription(undefined),
123+
switchLogoSettings: {},
124+
switchLogoOpenedState: new ValueRefWithReady<SwitchLogoOpenedState>(SwitchLogoOpenedState.Unopened),
122125
}
123126
},
124127
permission: {

packages/flags/src/flags/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const flags = {
5454
wc_v2_project_id: '8f1769933420afe8873860925fcca14f',
5555
wc_v2_mode: process.env.NODE_ENV === 'production' ? 'error' : 'debug',
5656
wc_v1_enabled: true,
57-
wc_v2_enabled: betaOrInsiderOnly,
57+
wc_v2_enabled: false,
5858
} as const
5959

6060
Object.freeze(flags.shadowRootInit)
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

packages/icons/icon-generated-as-jsx.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,16 @@ export const TelegramRound = /*#__PURE__*/ __createIcon('TelegramRound', [
467467
u: () => new URL('./brands/TelegramRound.svg', import.meta.url),
468468
},
469469
])
470+
export const Twitter3 = /*#__PURE__*/ __createIcon('twitter3', [
471+
{
472+
c: ['dark'],
473+
u: () => new URL('./brands/twitter3.dark.svg', import.meta.url),
474+
},
475+
{
476+
c: ['light'],
477+
u: () => new URL('./brands/twitter3.light.svg', import.meta.url),
478+
},
479+
])
470480
export const TwitterColored = /*#__PURE__*/ __createIcon('TwitterColored', [
471481
{
472482
u: () => new URL('./brands/TwitterColored.svg', import.meta.url),
@@ -2201,6 +2211,16 @@ export const SwapColorful = /*#__PURE__*/ __createIcon('SwapColorful', [
22012211
u: () => new URL('./general/SwapColorful.svg', import.meta.url),
22022212
},
22032213
])
2214+
export const SwitchLogo = /*#__PURE__*/ __createIcon('SwitchLogo', [
2215+
{
2216+
c: ['dark'],
2217+
u: () => new URL('./general/SwitchLogo.dark.svg', import.meta.url),
2218+
},
2219+
{
2220+
c: ['light'],
2221+
u: () => new URL('./general/SwitchLogo.light.svg', import.meta.url),
2222+
},
2223+
])
22042224
export const TelegramRoundGray = /*#__PURE__*/ __createIcon('TelegramRoundGray', [
22052225
{
22062226
u: () => new URL('./general/TelegramRoundGray.svg', import.meta.url),

packages/icons/icon-generated-as-url.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ export function solana_url() { return new URL("./brands/Solana.svg", import.meta
9090
export function sushi_swap_url() { return new URL("./brands/SushiSwap.png", import.meta.url) }
9191
export function sybil_url() { return new URL("./brands/Sybil.png", import.meta.url) }
9292
export function telegram_round_url() { return new URL("./brands/TelegramRound.svg", import.meta.url) }
93+
export function twitter_3_dark_url() { return new URL("./brands/twitter3.dark.svg", import.meta.url) }
94+
export function twitter_3_light_url() { return new URL("./brands/twitter3.light.svg", import.meta.url) }
9395
export function twitter_colored_url() { return new URL("./brands/TwitterColored.svg", import.meta.url) }
9496
export function twitter_other_colored_url() { return new URL("./brands/TwitterOtherColored.svg", import.meta.url) }
9597
export function twitter_round_url() { return new URL("./brands/TwitterRound.svg", import.meta.url) }
@@ -260,6 +262,8 @@ export function success_url() { return new URL("./general/Success.svg", import.m
260262
export function success_for_snack_bar_url() { return new URL("./general/SuccessForSnackBar.svg", import.meta.url) }
261263
export function swap_url() { return new URL("./general/Swap.svg", import.meta.url) }
262264
export function swap_colorful_url() { return new URL("./general/SwapColorful.svg", import.meta.url) }
265+
export function switch_logo_dark_url() { return new URL("./general/SwitchLogo.dark.svg", import.meta.url) }
266+
export function switch_logo_light_url() { return new URL("./general/SwitchLogo.light.svg", import.meta.url) }
263267
export function telegram_round_gray_url() { return new URL("./general/TelegramRoundGray.svg", import.meta.url) }
264268
export function tick_url() { return new URL("./general/Tick.svg", import.meta.url) }
265269
export function tip_url() { return new URL("./general/Tip.svg", import.meta.url) }

0 commit comments

Comments
 (0)