Bringing in emotes, stickers, and refactors from ody #7435

Merged
jessopb merged 8 commits from reactorMentions into master 2022-01-24 17:07:09 +01:00
4 changed files with 11 additions and 5 deletions
Showing only changes of commit dfc2ae2827 - Show all commits

View file

@ -2242,5 +2242,10 @@
"LBC": "LBC",
"Add a Card": "Add a Card",
" To Tip Creators": " To Tip Creators",
"Nothing found": "Nothing found",
"From Comments": "From Comments",
"This support is priced in $USD.": "This support is priced in $USD.",
"The current exchange rate for the submitted LBC amount is ~ $%exchange_amount%.": "The current exchange rate for the submitted LBC amount is ~ $%exchange_amount%.",
"Amount of $%input_amount% LBC in USB is lower than price of $%price_amount%": "Amount of $%input_amount% LBC in USB is lower than price of $%price_amount%",
"--end--": "--end--"
}

View file

@ -143,7 +143,7 @@ export function CommentCreate(props: Props) {
setStickerSelector(false);
if (sticker.price && sticker.price > 0) {
setActiveTab(TAB_FIAT);
setActiveTab(TAB_LBC);
setIsSupportComment(true);
}
}
@ -252,7 +252,7 @@ export function CommentCreate(props: Props) {
}
);
} else {
// No cash tips
// No cash tips - REMOVE
// const tipParams: TipParams = { tipAmount: Math.round(tipAmount * 100) / 100, tipChannelName, channelClaimId };
// const userParams: UserParams = { activeChannelName, activeChannelId };
// sendCashTip(tipParams, userParams, claim.claim_id, stripeEnvironment, (customerTipResponse) => {
@ -364,6 +364,7 @@ export function CommentCreate(props: Props) {
.catch(() => {});
}, [canReceiveFiatTip, claim.claim_id, claim.name, claim.signing_channel, stickerSelector]);
// LIVESTREAM ONLY - REMOVE
// Handle keyboard shortcut comment creation
// React.useEffect(() => {
// function altEnterListener(e: SyntheticKeyboardEvent<*>) {
@ -591,7 +592,7 @@ export function CommentCreate(props: Props) {
setStickerSelector(true);
}
)}
{/* below buttons are unnecessary - REMOVE */}
{!claimIsMine && (
<>
{(!isSupportComment || activeTab !== TAB_LBC) &&

View file

@ -3,7 +3,7 @@
const buildCDNUrl = (path: string) => `https://static.odycdn.com/emoticons/${path}`;
const buildEmote = (name: string, path: string) => ({
name: __(`:${name}:`),
name: `:${name}:`,
url: buildCDNUrl(path),
});

View file

@ -3,7 +3,7 @@
const buildCDNUrl = (path: string) => `https://static.odycdn.com/stickers/${path}`;
const buildSticker = (name: string, path: string, price?: number) => ({
name: __(`:${name}:`),
name: `:${name}:`,
url: buildCDNUrl(path),
price: price,
});