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(frontend): 絵文字ピッカー設定ページのボタン文言修正 #12676

Merged
merged 4 commits into from
Dec 16, 2023

Conversation

samunohito
Copy link
Member

What

#12669 をご参照ください。

Why

fix #12669

Additional info (optional)

pnpm build && pnpm start にて文言を表示確認

Checklist

  • Read the contribution guide
  • Test working in a local environment
  • (If needed) Add story of storybook
  • (If needed) Update CHANGELOG.md ※直近の対応に対するfixなので記載していません
  • (If possible) Add tests

Copy link

codecov bot commented Dec 15, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (3906028) 79.64% compared to head (8979a02) 79.64%.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop   #12676   +/-   ##
========================================
  Coverage    79.64%   79.64%           
========================================
  Files          955      955           
  Lines       107678   107678           
  Branches      8349     8351    +2     
========================================
+ Hits         85757    85764    +7     
+ Misses       21921    21914    -7     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@samunohito
Copy link
Member Author

(vitestが死んでるのはリリース用プルリクと同件かしら…)

copyFromPinnedEmojisForReaction: "リアクション設定からコピーする"
copyFromPinnedEmojis: "絵文字設定からコピーする"
copyFromPinnedEmojisForReaction: "リアクション設定から上書きする"
copyFromPinnedEmojis: "全般設定から上書きする"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

キー名も overwrite に変えた方が良さそう

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

なおしました 🙏

@github-actions github-actions bot added the packages/frontend Client side specific issue/PR label Dec 16, 2023
@syuilo syuilo merged commit d7d9304 into misskey-dev:develop Dec 16, 2023
15 checks passed
@syuilo
Copy link
Member

syuilo commented Dec 16, 2023

🙏🏻

camilla-ett pushed a commit to kaseiski/misskey that referenced this pull request Jan 2, 2024
* fix(frontend): 絵文字ピッカー設定ページのボタン文言修正

* fix
@samunohito samunohito deleted the fix/12669_fix_button_word branch January 11, 2024 00:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packages/frontend Client side specific issue/PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

絵文字ピッカー設定画面のレイアウト・文言改善提案
2 participants