Skip to content

Commit

Permalink
Merge pull request stakwork#498 from stakwork/fix/profile_connect
Browse files Browse the repository at this point in the history
fixed assigned redirection
  • Loading branch information
elraphty authored Apr 24, 2024
2 parents c1bbcec + 64a7770 commit 9091a60
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/config/ModeDispatcher.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export enum AppMode {
}

const hosts: { [k: string]: AppMode } = {
'localhost:3000': AppMode.TRIBES,
'localhost:3000': AppMode.COMMUNITY,
'localhost:13000': AppMode.TRIBES,
'localhost:23000': AppMode.TRIBES,
'tribes.sphinx.chat': AppMode.TRIBES,
Expand Down
1 change: 0 additions & 1 deletion src/pages/people/tabs/Wanted.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { paginationQueryLimit } from 'store/main';
import styled from 'styled-components';
import { LoadMoreContainer } from '../../../people/widgetViews/WidgetSwitchViewer';
import { colors } from '../../../config/colors';
import checkboxImage from './Icons/checkboxImage.svg';
import PopoverCheckbox from './popoverCheckboxStyles';

const config = widgetConfigs.bounties;
Expand Down
1 change: 1 addition & 0 deletions src/people/interfaces.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ export interface NameTagProps {
org_img?: string;
org_name?: string;
org_uuid?: string;
uuid?: string;
}

export interface NoneSpaceProps {
Expand Down
19 changes: 15 additions & 4 deletions src/people/utils/NameTag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,19 @@ const Wrap = styled.div<WrapProps>`
`;

function NameTag(props: NameTagProps) {
const { owner_alias, owner_pubkey, img, created, id, style, widget, iconSize, textSize, isPaid } =
props;
const {
owner_alias,
owner_pubkey,
uuid,
img,
created,
id,
style,
widget,
iconSize,
textSize,
isPaid
} = props;
const { ui, main } = useStores();
const color = colors['light'];

Expand All @@ -94,8 +105,8 @@ function NameTag(props: NameTagProps) {
ui.setSelectedPerson(id);
ui.setSelectingPerson(id);

if (owner_pubkey) {
history.push(`/p/${owner_pubkey}`);
if (uuid) {
history.push(`/p/${uuid}`);
}
}

Expand Down
1 change: 0 additions & 1 deletion src/people/widgetViews/UserTicketsView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import { colors } from '../../config/colors';
import WantedView from './WantedView';
import DeleteTicketModal from './DeleteModal';
import { LoadMoreContainer } from './WidgetSwitchViewer';
import checkboxImage from './Icons/checkboxImage.svg';

type BountyType = any;

Expand Down
4 changes: 2 additions & 2 deletions src/people/widgetViews/wantedViews/DesktopView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@ function DesktopView(props: WantedViewsProps) {
`/p/${
{
...assignee
}.owner_pubkey
}?widget=wanted`,
}.uuid
}?widget=bounties`,
'_blank'
);
}}
Expand Down

0 comments on commit 9091a60

Please sign in to comment.