rebase 2
This commit is contained in:
parent
b45bcef1fb
commit
45a210fdb5
@ -31,7 +31,7 @@ import {
|
|||||||
import { NoteCreator } from "Element/NoteCreator";
|
import { NoteCreator } from "Element/NoteCreator";
|
||||||
import Reactions from "Element/Reactions";
|
import Reactions from "Element/Reactions";
|
||||||
import SendSats from "Element/SendSats";
|
import SendSats from "Element/SendSats";
|
||||||
import { parseZap, ParsedZap, ZapsSummary } from "Element/Zap";
|
import { parseZap, ZapsSummary } from "Element/Zap";
|
||||||
import { useUserProfile } from "Feed/ProfileFeed";
|
import { useUserProfile } from "Feed/ProfileFeed";
|
||||||
import { default as NEvent } from "Nostr/Event";
|
import { default as NEvent } from "Nostr/Event";
|
||||||
import { RootState } from "State/Store";
|
import { RootState } from "State/Store";
|
||||||
|
@ -126,10 +126,10 @@ const Reactions = ({
|
|||||||
<span className="zap-amount">{formatShort(z.amount)}</span>
|
<span className="zap-amount">{formatShort(z.amount)}</span>
|
||||||
</div>
|
</div>
|
||||||
<ProfileImage
|
<ProfileImage
|
||||||
pubkey={z.zapper!}
|
pubkey={z.zapper ?? ""}
|
||||||
subHeader={<>{z.content}</>}
|
subHeader={<>{z.content}</>}
|
||||||
/>
|
/>
|
||||||
<FollowButton pubkey={z.zapper!} />
|
<FollowButton pubkey={z.zapper ?? ""} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
|
@ -49,7 +49,6 @@ const messages = defineMessages({
|
|||||||
Add: "Add",
|
Add: "Add",
|
||||||
AddRelays: "Add Relays",
|
AddRelays: "Add Relays",
|
||||||
Name: "Name",
|
Name: "Name",
|
||||||
Profile: "Profile",
|
|
||||||
Website: "Website",
|
Website: "Website",
|
||||||
Save: "Save",
|
Save: "Save",
|
||||||
DisplayName: "Display name",
|
DisplayName: "Display name",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
git:
|
git:
|
||||||
filters:
|
filters:
|
||||||
- filter_type: dir
|
- filter_type: dir
|
||||||
file_format: KEYVALUEJSON
|
file_format: KEYVALUEJSON
|
||||||
source_file_dir: 'src/translations'
|
source_file_dir: "src/translations"
|
||||||
translation_files_expression: 'src/translations/<lang>.json'
|
translation_files_expression: "src/translations/<lang>.json"
|
||||||
|
Loading…
Reference in New Issue
Block a user