Fixed create channel ui , fixed message for unlock profile, removed g…

…overnance from sidebar (#1817) * fixed minor ui issues * fixed minor ui issues * fixed minor ui issues * fixed select text color * fixed select text color * fixed select text color * fixed chain issue
push-protocol · Aug 21, 2024 · 51e30be · 51e30be
1 parent 5add89b
commit 51e30be
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 60 deletions.
diff --git a/src/blocks/select/Select.tsx b/src/blocks/select/Select.tsx
@@ -155,7 +155,7 @@ const StyledOption = styled(ComboboxOption)`
  align-items: center;
  padding: var(--spacing-xxxs, 4px);
  gap: var(--spacing-xxs, 8px);
- color: var(--components-dropdown-text-default, #17181b);
+ color: var(--components-list-item-text-default);
  font-family: var(--font-family);
  font-size: ${textVariants['bs-regular'].fontSize};
  font-style: ${textVariants['bs-regular'].fontStyle};

diff --git a/src/common/components/Stepper.tsx b/src/common/components/Stepper.tsx
@@ -3,6 +3,7 @@ import { FC } from 'react';
 
 // Components
 import { Box, Text } from 'blocks';
+import { css } from 'styled-components';
 
 type StepperProps = {
  steps: Array<{ label: string; value: string }>;
@@ -20,14 +21,18 @@ const Stepper: FC<StepperProps> = ({ steps, setActiveStepKey, completedSteps })
  <Box
  display="flex"
  gap="spacing-lg"
+ width="inherit"
+ justifyContent="space-between"
  >
  {steps.map((step, index) => (
  <Box
  key={index}
  display="flex"
  flexDirection="column"
  gap="spacing-xs"
- width="180px"
+ css={css`
+ flex: 1;
+ `}
  cursor="pointer"
  onClick={() => handleChangeActiveStep(step.value)}
  >

diff --git a/src/config/NavigationList.js b/src/config/NavigationList.js
@@ -88,11 +88,8 @@ const NavigationList = {
  },
  },
  },
-
-
  },
  Messsaging: {
-
  chat: {
  src: 'chatOffIcon',
  activeSrc: 'chatOnIcon',
@@ -118,12 +115,8 @@ const NavigationList = {
  },
  },
  },
-
-
-
  },
  Developers: {
-
  createChannel: {
  uid: GLOBALS.CONSTANTS.NAVBAR_IDENTIFIERS.CREATE_CHANNEL,
  src: 'createChannelIcon',
@@ -176,11 +169,7 @@ const NavigationList = {
  },
  },
  },
-
-
-
-
- }
+ },
  },
  third: {
  yieldv2: {
@@ -257,31 +246,31 @@ const NavigationList = {
  // }
  // }
  // },
- governance: {
- uid: GLOBALS.CONSTANTS.NAVBAR_IDENTIFIERS.GOVERNANCE,
- src: 'govOffIcon',
- activeSrc: 'govOnIcon',
- iconFactory: null,
- name: 'Governance',
- title: 'Governance',
- alt: 'Governance',
- href: APP_PATHS.Govern,
- newTab: false,
- isRoute: true,
- hasMenuLogic: true,
- hidden: false,
- headerTag: {
- title: 'Governance',
- light: {
- bg: GLOBALS.COLORS.GRADIENT_SECONDARY,
- fg: themeLight.headerTagFg,
- },
- dark: {
- bg: themeDark.headerTagBg,
- fg: themeDark.headerTagFg,
- },
- },
- },
+ // governance: {
+ //  uid: GLOBALS.CONSTANTS.NAVBAR_IDENTIFIERS.GOVERNANCE,
+ //  src: 'govOffIcon',
+ //  activeSrc: 'govOnIcon',
+ //  iconFactory: null,
+ //  name: 'Governance',
+ //  title: 'Governance',
+ //  alt: 'Governance',
+ //  href: APP_PATHS.Govern,
+ //  newTab: false,
+ //  isRoute: true,
+ //  hasMenuLogic: true,
+ //  hidden: false,
+ //  headerTag: {
+ //  title: 'Governance',
+ //  light: {
+ //  bg: GLOBALS.COLORS.GRADIENT_SECONDARY,
+ //  fg: themeLight.headerTagFg,
+ //  },
+ //  dark: {
+ //  bg: themeDark.headerTagBg,
+ //  fg: themeDark.headerTagFg,
+ //  },
+ //  },
+ // },
 
  // incentives: {
  // src: 'incentivesOffIcon',
@@ -471,8 +460,8 @@ const NavigationList = {
  },
  },
  },
- }
-}
+ },
+};
 
 // // remove secret feature
 // if (

diff --git a/src/modules/addNewChain/AddNewChain.tsx b/src/modules/addNewChain/AddNewChain.tsx
@@ -171,11 +171,13 @@ const AddNewChain: FC = () => {
  </>
  ) : channelDetails || alaisDetails ? (
  <>
- <Stepper
- steps={addNewChainSteps}
- completedSteps={completedSteps}
- setActiveStepKey={(key) => setActiveStepKey(key as ActiveStepKey)}
- />
+ <Box width="100%">
+ <Stepper
+ steps={addNewChainSteps}
+ completedSteps={completedSteps}
+ setActiveStepKey={(key) => setActiveStepKey(key as ActiveStepKey)}
+ />
+ </Box>
  {activeStepKey === 'newaddress' && (
  <NewAddress
  isLoading={isPending && !isError}
@@ -209,6 +211,7 @@ const AddNewChain: FC = () => {
  type={UNLOCK_PROFILE_TYPE.MODAL}
  showConnectModal={true}
  onClose={handleCloseAuthModal}
+ description="Unlock your profile to proceed."
  />
  </Box>
  )}

diff --git a/src/modules/createChannel/CreateChannel.tsx b/src/modules/createChannel/CreateChannel.tsx
@@ -144,7 +144,7 @@ const CreateChannel = () => {
  'Creating your channel, Aligning pixels, adjusting padding... This may take some time.',
  'Redirecting... Please do not refresh'
  );
- navigate(`${APP_PATHS.ChannelDashboard}/${account}`)
+ navigate(`${APP_PATHS.ChannelDashboard}/${account}`);
  }, 3000);
  }
  },
@@ -213,14 +213,16 @@ const CreateChannel = () => {
  return (
  <CreateChannelFormProvider onSubmit={(values: ChannelInfoFormValues) => handleCreateNewChannel(values)}>
  <Box
- padding={{ initial: 'spacing-lg', ml: 'spacing-sm' }}
- backgroundColor="surface-primary"
- borderRadius="radius-md"
+ padding={{ dp: 'spacing-lg', ml: 'spacing-sm' }}
  display="flex"
- width={{ initial: '648px', ml: '325px' }}
  flexDirection="column"
- alignItems="center"
  gap="spacing-xl"
+ alignSelf="center"
+ width={{ dp: '648px', ml: '357px' }}
+ borderRadius="radius-md"
+ alignItems="center"
+ backgroundColor="surface-primary"
+ margin={{ dp: 'spacing-lg', ml: 'spacing-sm' }}
  >
  <CreateChannelHeader />
 
@@ -246,12 +248,13 @@ const CreateChannel = () => {
  alignItems="center"
  alignSelf="stretch"
  >
- <Stepper
- steps={createChannelSteps}
- completedSteps={completedSteps}
- setActiveStepKey={(key) => setActiveStepKey(key as ActiveStepKey)}
- />
-
+ <Box width="100%">
+ <Stepper
+ steps={createChannelSteps}
+ completedSteps={completedSteps}
+ setActiveStepKey={(key) => setActiveStepKey(key as ActiveStepKey)}
+ />
+ </Box>
  {activeStepKey == 'channelInfo' && (
  <ChannelInfo
  handleNextStep={handleNextStep}

diff --git a/src/modules/sendNotification/SendNotification.form.ts b/src/modules/sendNotification/SendNotification.form.ts
@@ -3,6 +3,7 @@ import * as yup from 'yup';
 
 import { SelectOption } from 'blocks/select/Select';
 import { getRequiredFieldMessage } from 'common';
+import { appConfig } from 'config';
 
 export const getValidationSchema = (isSubsetRecipientPresent: boolean) => {
  return yup.object().shape({
@@ -31,7 +32,7 @@ export const getValidationSchema = (isSubsetRecipientPresent: boolean) => {
 export const getFormInitialValues = (delegateesOptions: SelectOption[]) => {
  return {
  channelAddress: delegateesOptions[0]?.value || '',
- chainId: '11155111',
+ chainId: appConfig.coreContractChain.toString(),
  type: 'BROADCAST' as NotificationType,
  recipient: '',
  titleChecked: false,

diff --git a/src/modules/sendNotification/SendNotification.tsx b/src/modules/sendNotification/SendNotification.tsx
@@ -71,6 +71,7 @@ const SendNotification: FC = () => {
  type={UNLOCK_PROFILE_TYPE.MODAL}
  showConnectModal={true}
  onClose={() => setIsAuthModalVisible(false)}
+ description="Unlock your profile to proceed."
  />
  </Box>
  )}

diff --git a/src/modules/sendNotification/SendNotification.utils.tsx b/src/modules/sendNotification/SendNotification.utils.tsx
@@ -1,6 +1,7 @@
 import { NotificationType } from '@pushprotocol/restapi';
 
 import { Box } from 'blocks';
+import { appConfig } from 'config';
 import { convertAddressToAddrCaip } from 'helpers/CaipHelper';
 
 import { ChannelSetting } from 'helpers/channel/types';
@@ -12,7 +13,7 @@ export const getChannelChainList = (channelDetails: ChannelDetails) => {
  channelDetails?.aliases
  ?.filter((alias) => alias.is_alias_verified)
  ?.map((alias) => parseInt(alias.alias_blockchain_id)) || [];
- return [...aliases, 11155111];
+ return [...aliases, appConfig.coreContractChain];
 };
 
 export const getChannelDelegatesOptions = (delegatees: [ChannelDetails]) => {