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

Alpha deployment #1178

Merged
merged 73 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
6d61a4e
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.61
mohammeds1992 Jan 3, 2024
f07f84b
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Jan 3, 2024
38c7539
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.62
mohammeds1992 Jan 3, 2024
25f6f4f
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Jan 15, 2024
a1dfaa9
ci(restapi): 🎉 cut release to restapi-v0.9.0
mohammeds1992 Jan 15, 2024
f90e416
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.63
mohammeds1992 Jan 15, 2024
f93c645
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Jan 18, 2024
6a91107
fix: fix errors
mohammeds1992 Jan 18, 2024
65d46c6
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.64
mohammeds1992 Jan 18, 2024
e597fe5
fix: changed stream type to any
mishramonalisha76 Jan 18, 2024
859341e
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.16
mohammeds1992 Jan 18, 2024
d75a862
fix: minor change
mohammeds1992 Jan 18, 2024
e57160a
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.17
mohammeds1992 Jan 18, 2024
3034c2c
fix: minor fix
mohammeds1992 Jan 18, 2024
2f7f04e
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.36
mohammeds1992 Jan 18, 2024
bb3bdf5
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Jan 19, 2024
a05ba4a
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.37
mohammeds1992 Jan 19, 2024
6bac687
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Jan 25, 2024
77896b6
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.38
mohammeds1992 Jan 25, 2024
12179ab
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Jan 25, 2024
6054507
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.39
mohammeds1992 Jan 25, 2024
d4484dd
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.39
mohammeds1992 Jan 25, 2024
e7d53ca
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Jan 29, 2024
df6c7a7
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.40
mohammeds1992 Jan 29, 2024
e3d08bb
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Feb 1, 2024
e85d484
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.41
mohammeds1992 Feb 1, 2024
e80f2f8
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Feb 7, 2024
0d61b10
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Feb 8, 2024
f822908
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.65
mohammeds1992 Feb 8, 2024
bbf3ddf
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.42
mohammeds1992 Feb 8, 2024
feb77a9
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Feb 8, 2024
ff22863
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.66
mohammeds1992 Feb 8, 2024
2c0a4b9
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Feb 9, 2024
3edb0ed
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.43
mohammeds1992 Feb 9, 2024
be6cac0
fix: Merge alpha
mishramonalisha76 Feb 13, 2024
cdee5c6
fix: fixed build issues
mishramonalisha76 Feb 13, 2024
c6962ab
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.36
mishramonalisha76 Feb 13, 2024
2962c6c
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.44
mishramonalisha76 Feb 13, 2024
9014a76
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.67
mishramonalisha76 Feb 13, 2024
2b02a65
fix: fixed minor bugs
mishramonalisha76 Feb 13, 2024
c6ba60b
fix: fixed conflicts
mishramonalisha76 Feb 13, 2024
ff6b576
fix: fixed chatpreview and widget issues
mishramonalisha76 Feb 19, 2024
db2fd58
fix: fixed merge conflicts
mishramonalisha76 Feb 19, 2024
f4cdbda
fix: fixed chat bugs
mishramonalisha76 Feb 21, 2024
50b6fd3
fix: testing readMode
mishramonalisha76 Feb 21, 2024
7214d68
fix: fixed readmode
mishramonalisha76 Feb 21, 2024
3d7f70f
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.68
mohammeds1992 Feb 21, 2024
dd7a75c
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.68
mohammeds1992 Feb 21, 2024
13649ff
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.70
mohammeds1992 Feb 21, 2024
07cdbeb
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Feb 26, 2024
c9894ca
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.71
mohammeds1992 Feb 26, 2024
25184de
fix: fixed chatpreview
mishramonalisha76 Feb 28, 2024
815c59a
fix: troubleshoot
mishramonalisha76 Feb 29, 2024
c8d7a06
fix: merge issues
mishramonalisha76 Feb 29, 2024
8d33691
fix: pulled alpha
mishramonalisha76 Feb 29, 2024
f08725e
fix: fixed gues mode user profile
mishramonalisha76 Mar 1, 2024
5431ff8
fix: fixed subscription error
mishramonalisha76 Mar 1, 2024
93e6231
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Mar 2, 2024
747baab
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.72
mohammeds1992 Mar 2, 2024
c63cbb8
fix: fixed support chat issues
mishramonalisha76 Mar 5, 2024
f68a1ed
fix: fixed build issues
mishramonalisha76 Mar 5, 2024
ddfba9e
fix: Merge branch 'alpha' into alpha-deployment
mohammeds1992 Mar 7, 2024
6c85e2b
ci(uiweb): 🎉 cut beta release to uiweb-v0.0.1-alpha.45
mohammeds1992 Mar 7, 2024
3a11272
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.73
mohammeds1992 Mar 7, 2024
f5a8f63
ci(restapi): 🎉 cut beta release to restapi-v0.0.1-alpha.74
mohammeds1992 Mar 7, 2024
cfbff87
fix: pulled alpha
mishramonalisha76 Mar 8, 2024
d39dd0e
fix: pulled alpha
mishramonalisha76 Mar 21, 2024
a53271f
fix: pulled alpha
mishramonalisha76 Mar 21, 2024
ef944e4
fix: merged settings pr
mishramonalisha76 Mar 21, 2024
4d1c5ef
fix: merge alpha
mohammeds1992 Mar 21, 2024
6cd5dd8
fix: fixed berachain issue
mishramonalisha76 Mar 21, 2024
af3efe2
fix: fixed span
mishramonalisha76 Mar 21, 2024
f22e9fb
fix: pulled
mishramonalisha76 Mar 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export const ChatProfileTest = () => {
<ChatProfile
chatProfileLeftHelperComponent={<div>left component</div>}
chatProfileRightHelperComponent={<div>right component</div>}
chatId='4ac5ab85c9c3d57adbdf2dba79357e56b2f9ef0256befe750d9f93af78d2ca68'
chatId='monalisha.wallet'
// chatId='36baf37e441fdd94e23406c6c716fc4e91a93a9ee68e070cd5b054534dbe09a6'
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const ChatViewComponentTest = () => {
<div>
<h2>Chat View Test page</h2>

{/* <CreateGroupModal onClose={()=>{console.log('in close')}} /> */}
<CreateGroupModal onClose={()=>{console.log('in close')}} />
<ChatViewComponentCard>
{/* <CreateGroupModal onClose={()=>{console.log('in close')}} modalBackground={MODAL_BACKGROUND_TYPE.OVERLAY} modalPositionType={MODAL_POSITION_TYPE.RELATIVE}/> */}
<ChatView
Expand Down
2 changes: 1 addition & 1 deletion packages/restapi/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pushprotocol/restapi",
"version": "1.7.2",
"version": "0.0.1-alpha.74",
"type": "commonjs",
"publishConfig": {
"registry": "https://registry.npmjs.org/"
Expand Down
23 changes: 23 additions & 0 deletions packages/uiweb/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,29 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [0.0.1-alpha.45](https://github.com/ethereum-push-notification-service/push-sdk/compare/uiweb-0.0.1-alpha.44...uiweb-0.0.1-alpha.45) (2024-03-07)


### Bug Fixes

* added prefillChatList ([#1122](https://github.com/ethereum-push-notification-service/push-sdk/issues/1122)) ([8b00609](https://github.com/ethereum-push-notification-service/push-sdk/commit/8b006090d414c19f75a13ca782cde5dab0569b91))
* fixed build issues ([f68a1ed](https://github.com/ethereum-push-notification-service/push-sdk/commit/f68a1edad6aa0b4c43511cd3f25cb08888f2a235))
* fixed chat bugs ([f4cdbda](https://github.com/ethereum-push-notification-service/push-sdk/commit/f4cdbdac6088cfc31b2b555038838bd5bb795f0c))
* fixed chatpreview ([25184de](https://github.com/ethereum-push-notification-service/push-sdk/commit/25184de7d505d72b1603e37b630d9ed205d479f5))
* fixed chatpreview and widget issues ([ff6b576](https://github.com/ethereum-push-notification-service/push-sdk/commit/ff6b576ed969b328c29806966daee57b397f83a2))
* fixed gues mode user profile ([f08725e](https://github.com/ethereum-push-notification-service/push-sdk/commit/f08725e27e5e6257cdaccd0634d706d4ce4de8b2))
* fixed merge conflicts ([db2fd58](https://github.com/ethereum-push-notification-service/push-sdk/commit/db2fd5860ced139b5d5cc269e1cd518e52e4e180))
* fixed minor bugs ([2b02a65](https://github.com/ethereum-push-notification-service/push-sdk/commit/2b02a65907659cecfbcdbf03e78b20b60a9021c1))
* fixed minor issue ([841a2b7](https://github.com/ethereum-push-notification-service/push-sdk/commit/841a2b79e504af904aa99fc07b1d73c9e4f56b22))
* fixed subscription error ([5431ff8](https://github.com/ethereum-push-notification-service/push-sdk/commit/5431ff849d7c01cbbb2511ebc9473d3d8548b2b3))
* fixed support chat issues ([c63cbb8](https://github.com/ethereum-push-notification-service/push-sdk/commit/c63cbb8b64c20c2b84046beae7e3b6135ca9332e))
* pulled alpha ([8d33691](https://github.com/ethereum-push-notification-service/push-sdk/commit/8d336911012e39bb0c4360820754230fa9b28a55))
* stream connection support chat + pushUser to user fix ([#1066](https://github.com/ethereum-push-notification-service/push-sdk/issues/1066)) ([0ea4e02](https://github.com/ethereum-push-notification-service/push-sdk/commit/0ea4e026bceb38d3b37267b43709614cb1740472))
* troubleshoot ([815c59a](https://github.com/ethereum-push-notification-service/push-sdk/commit/815c59a87deba30c8323a4d7d68f48bcedbbe730))



## [0.0.1-alpha.44](https://github.com/ethereum-push-notification-service/push-sdk/compare/uiweb-0.0.1-alpha.36...uiweb-0.0.1-alpha.44) (2024-02-13)
## [1.2.7](https://github.com/ethereum-push-notification-service/push-sdk/compare/uiweb-1.2.6...uiweb-1.2.7) (2024-03-11)


Expand Down
2 changes: 1 addition & 1 deletion packages/uiweb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pushprotocol/uiweb",
"version": "1.2.7",
"version": "0.0.1-alpha.45",
"publishConfig": {
"registry": "https://registry.npmjs.org/"
},
Expand Down
15 changes: 10 additions & 5 deletions packages/uiweb/src/lib/components/chat/CreateGroup/AddCriteria.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import BSCSvg from '../../../icons/bsc.svg';
import FuseSvg from '../../../icons/fuse.svg';

import OptimismSvg from '../../../icons/optimisim.svg';
import { BLOCKCHAIN_NETWORK, device } from '../../../config';
import { BLOCKCHAIN_NETWORK, ENV, device } from '../../../config';
import { GUILD_COMPARISON_OPTIONS, INVITE_CHECKBOX_LABEL } from '../constants';
import {
CATEGORY,
Expand Down Expand Up @@ -252,14 +252,19 @@ const AddCriteria = ({
icon: FuseSvg,
function: () => setSelectedChainValue(5),
},
{

];
if(env !== ENV.PROD)
{

dropdownChainsValues.push( {
id: 6,
value: BLOCKCHAIN_NETWORK[env].BERACHAIN,
title: 'Berachain',
icon: BerachainSvg,
function: () => setSelectedChainValue(46),
},
];
function: () => setSelectedChainValue(6),
} as DropdownValueType)
}

const onQuantityChange = (e: any) => {
setQuantity({ ...quantity, value: e.target.value });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export const ProfileContainer = ({
src={member?.image}
/>
</Section>
<Section flexDirection="column" alignItems="start" gap="5px" >
<Section flexDirection="column" alignItems="start" gap="5px" whiteSpace='nowrap' >
{!!member?.web3Name && (
<Span
fontSize={customStyle?.fontSize ?? '18px'}
Expand Down Expand Up @@ -92,6 +92,7 @@ export const ProfileContainer = ({
theme.textColor?.modalSubHeadingText
}
position="relative"
whiteSpace='nowrap'
>
{member.wallet}
</Span>
Expand Down
5 changes: 5 additions & 0 deletions packages/uiweb/src/lib/components/reusables/sharedStyling.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ type SpanStyleProps = {
maxWidth?: string;
width?: string;
cursor?: string;
whiteSpace?:string;
};

export const Span = styled.span<SpanStyleProps>`
Expand All @@ -49,6 +50,7 @@ export const Span = styled.span<SpanStyleProps>`
width: ${(props) => props.width || 'auto'};
z-index: ${(props) => props.zIndex || 'auto'};
max-width: ${(props) => props.maxWidth || 'initial'};
white-space: ${(props) => props.whiteSpace || 'normal'};
`;

type AnchorStyleProps = {
Expand Down Expand Up @@ -132,6 +134,7 @@ type SectionStyleProps = {
borderWidth?: string;
borderRadius?: string;
flex?: string;
whiteSpace?:string;
zIndex?: string;
};

Expand Down Expand Up @@ -169,6 +172,8 @@ export const Section = styled.div<SectionStyleProps>`
border-color: ${(props) => props.borderColor || 'initial'};
border-style: ${(props) => props.borderStyle || 'initial'};
z-index: ${(props) => props.zIndex || '0'};
white-space: ${(props) => props.whiteSpace || 'normal'};

`;

type ImageStyleProps = {
Expand Down
Loading