Merge pull request #9 from MarcusMiguel/hotfix/moon-sigil-bug

Fixed sigil bug on moons
marcusmiguel · Sep 16, 2022 · 05f3610 · 05f3610
2 parents 858ff40 + 590fa70
commit 05f3610
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/ui/src/app.tsx b/ui/src/app.tsx
@@ -9,6 +9,7 @@ export function App() {
   const dispatch = useAppDispatch();
 
   useEffect(() => {
+    console.log(api.ship)
     dispatch(loadState());
     document.body.style.overflowX = "hidden";
     document.body.style.overflowY = "auto";

diff --git a/ui/src/components/Card/Card.tsx b/ui/src/components/Card/Card.tsx
@@ -44,6 +44,7 @@ export const Card = ({ advertisement, setAdToShow }: CardProps) => {
                     <SourceContainer>
                         <PublisherInfo>
                             {
+                                advertisement.ship && advertisement.ship.length <= 14 &&
                                 sigil({
                                     patp: advertisement?.ship,
                                     renderer: reactRenderer,

diff --git a/ui/src/components/Chats/Chats.tsx b/ui/src/components/Chats/Chats.tsx
@@ -87,6 +87,7 @@ export const Chats = () => {
                                 <CardUpperRow>
                                     <CardReceiver>
                                         <CardSigil> {
+                                            chat.receiver && chat.receiver.length <= 14 &&
                                             sigil({
                                                 patp: chat.receiver,
                                                 renderer: reactRenderer,
@@ -116,6 +117,7 @@ export const Chats = () => {
                             <ConversationUpperRow>
                                 <ConversationReceiver>
                                     {
+                                        currentChat.receiver && currentChat.receiver.length <= 14 &&
                                         sigil({
                                             patp: currentChat.receiver,
                                             renderer: reactRenderer,
@@ -137,8 +139,9 @@ export const Chats = () => {
                                         <ReceivedMessage key={index}>
                                             <SigilContainer>
                                                 {
+                                                    msg.ship && msg.ship.length <= 14 &&
                                                     sigil({
-                                                        patp: '~fidwed-sipwyn',
+                                                        patp: msg.ship,
                                                         renderer: reactRenderer,
                                                         size: 20,
                                                         colors: ['white', 'black'],

diff --git a/ui/src/components/Details/Details.tsx b/ui/src/components/Details/Details.tsx
@@ -194,7 +194,7 @@ export const Details = ({ advertisement, setAd, contentToShow }: DetailsProps) =
                                 </PriceContainer>}
                             <SourceContainer>
                                 <PublisherInfo>
-                                    {
+                                    {advertisement.ship && advertisement.ship.length <= 14 &&
                                         sigil({
                                             patp: advertisement.ship,
                                             renderer: reactRenderer,
@@ -246,7 +246,7 @@ export const Details = ({ advertisement, setAd, contentToShow }: DetailsProps) =
                     {displayChat && <Conversation id="detailsConversation">
                         <ConversationUpperRow>
                             <ConversationReceiver>
-                                {
+                                {advertisement.ship && advertisement.ship.length <= 14 &&
                                     sigil({
                                         patp: advertisement.ship,
                                         renderer: reactRenderer,
@@ -269,6 +269,7 @@ export const Details = ({ advertisement, setAd, contentToShow }: DetailsProps) =
                                         {/* {!(chat.msgs[index] && chat.msgs[index].ship != '~' + api.ship) && */}
                                         <SigilContainer>
                                             {
+                                                msg.ship && msg.ship.length <= 14 &&
                                                 sigil({
                                                     patp: msg.ship,
                                                     renderer: reactRenderer,

diff --git a/ui/src/components/List/List.tsx b/ui/src/components/List/List.tsx
@@ -124,9 +124,9 @@ export const List = ({ listAds, contentToShow }: ListProps) => {
                         <NotificationIcon />
                     </NotificationButton> */}
                     <UserInfo>
-                        {
+                        {api.ship && api.ship.length <= 14 &&
                             sigil({
-                                patp: api.ship!,
+                                patp: api.ship,
                                 renderer: reactRenderer,
                                 size: 20,
                                 colors: ['white', 'black'],

diff --git a/ui/src/components/List/style.ts b/ui/src/components/List/style.ts
@@ -16,11 +16,6 @@ export const ListGrid = styled.div`
     grid-template-columns: repeat(2, 1fr);
     gap: 1em;
     margin-bottom: 1.5em;
-
-    @media (max-width: 768px){
-        
-    }
-
 `;
 
 export const UpperRow = styled.div`

diff --git a/ui/vite.config.ts b/ui/vite.config.ts
@@ -9,6 +9,6 @@ export default ({ mode }) => {
   console.log(SHIP_URL);
 
   return defineConfig({
-    plugins: [urbitPlugin({ base: 'classifieds', target: SHIP_URL, secure: false }), reactRefresh()]
+    plugins: [urbitPlugin({ base: 'classifieds', target: SHIP_URL, secure: false }), reactRefresh()],
   });
 };