🩹 Sign addOpening tx with role account

packages/ui/src/app/pages/WorkingGroups/WorkingGroup/WorkingGroup.tsx

@@ -26,7 +26,7 @@ export function WorkingGroup() {
  const { name } = useParams<{ name: string }>()
  const { isLoading, group } = useWorkingGroup({ name: urlParamToWorkingGroupId(name) })
  const { workers } = useMyWorkers()
- const isLead = useMemo(
+ const lead = useMemo(
  () => group?.isActive && workers.find((w) => w.membership.id === group?.leadId),
  [workers, group?.isActive, group?.leadId]
  )
@@ -75,9 +75,9 @@ export function WorkingGroup() {
  </StatusGroup>
  )}
  </PreviousPage>
- {group && isLead && currentTab === 'OPENINGS' && (
+ {group && lead && currentTab === 'OPENINGS' && (
  <ButtonsGroup>
- <CreateOpeningButton group={group.id} />
+ <CreateOpeningButton worker={lead} />
  </ButtonsGroup>
  )}
  </PageHeaderRow>

packages/ui/src/working-groups/components/CreateOpeningButton.tsx

@@ -4,17 +4,17 @@ import { TransactionButton } from '@/common/components/buttons/TransactionButton
 import { PlusIcon } from '@/common/components/icons/PlusIcon'
 import { useModal } from '@/common/hooks/useModal'
 import { CreateOpeningModalCall } from '@/working-groups/modals/CreateOpening/types'
-import { GroupIdName } from '@/working-groups/types'
+import { Worker } from '@/working-groups/types'
 
 export interface CreateOpeningButtonProps {
- group: GroupIdName
+ worker: Worker
 }
 
-export const CreateOpeningButton = ({ group }: CreateOpeningButtonProps) => {
+export const CreateOpeningButton = ({ worker }: CreateOpeningButtonProps) => {
  const { showModal } = useModal()
  const createOpening = useCallback(
- () => showModal<CreateOpeningModalCall>({ modal: 'CreateOpening', data: { group } }),
- [group]
+ () => showModal<CreateOpeningModalCall>({ modal: 'CreateOpening', data: { worker } }),
+ [worker]
  )
 
  return (

packages/ui/src/working-groups/modals/CreateOpening/CreateOpening.tsx

@@ -16,8 +16,8 @@ import { isLastStepActive } from '@/common/modals/utils'
 import { getSteps } from '@/common/model/machines/getSteps'
 import { useYupValidationResolver } from '@/common/utils/validation'
 import { machineStateConverter } from '@/council/modals/AnnounceCandidacy/helpers'
-import { useMyMemberships } from '@/memberships/hooks/useMyMemberships'
 import { StyledStepperBody } from '@/proposals/modals/AddNewProposal'
+import { useWorker } from '@/working-groups/hooks/useWorker'
 
 import { SuccessModal, CreateOpeningSteps as Steps, ImportOpening } from './components'
 import { createOpeningMachine, CreateOpeningMachineState } from './machine'
@@ -28,11 +28,11 @@ export const CreateOpeningModal = () => {
  const [showImport, setShowImport] = useState<boolean>(false)
 
  const { api } = useApi()
- const { active: activeMember } = useMyMemberships()
  const [state, send, service] = useMachine(createOpeningMachine)
  const { hideModal, modalData } = useModal<CreateOpeningModalCall>()
 
- const { group } = modalData
+ const group = modalData.worker.group.id
+ const { worker } = useWorker(modalData.worker.id)
  const workingGroupConsts = api?.consts[group]
 
  const context = {
@@ -48,16 +48,17 @@ export const CreateOpeningModal = () => {
  }, [machineStateConverter(state.value)])
 
  const { transaction, feeInfo } = useTransactionFee(
- activeMember?.controllerAccount,
+ worker?.roleAccount,
  () => {
  if (api && group) {
  const { ...specifics } = form.getValues() as CreateOpeningForm
  const { description, stakePolicy, rewardPerBlock } = getTxParams(group, specifics)
  return api.tx[group].addOpening(description, 'Regular', stakePolicy, String(rewardPerBlock))
  }
  },
- [api?.isConnected, activeMember?.id, group, form.formState.isValidating]
+ [api?.isConnected, worker?.roleAccount, group, form.formState.isValidating]
  )
+
  const exportedJsonValue = useMemo(() => {
  const { ...specifics } = form.getValues() as CreateOpeningForm
  const exportValue = {
@@ -91,18 +92,18 @@ export const CreateOpeningModal = () => {
  if (state.matches('beforeTransaction')) {
  return feeInfo?.canAfford ? send('NEXT') : send('FAIL')
  }
- }, [state, activeMember?.id, feeInfo])
+ }, [state, feeInfo])
 
- if (!activeMember || state.matches('requirementsFailed')) {
+ if (state.matches('requirementsFailed')) {
  return null
  }
 
- if (state.matches('transaction') && transaction && group) {
+ if (state.matches('transaction') && transaction && worker) {
  return (
  <SignTransactionModal
  buttonText="Sign transaction and Create"
  transaction={transaction}
- signer={activeMember.controllerAccount}
+ signer={worker.roleAccount}
  service={state.children.transaction}
  >
  <TextMedium>You intend to create an Opening.</TextMedium>

packages/ui/src/working-groups/modals/CreateOpening/types.tsx

@@ -5,10 +5,10 @@ import * as Yup from 'yup'
 import { QuestionValueProps } from '@/common/components/EditableInputList/EditableInputList'
 import { ModalWithDataCall } from '@/common/providers/modal/types'
 import { BNSchema, minContext, minMixed } from '@/common/utils/validation'
-import { GroupIdName } from '@/working-groups/types'
+import { GroupIdName, Worker } from '@/working-groups/types'
 
 export interface OpeningModalData {
- group: GroupIdName
+ worker: Worker
 }
 
 export type CreateOpeningModalCall = ModalWithDataCall<'CreateOpening', OpeningModalData>