fix: rebase fixes

Author: adam-strzelec

docker/colony-cdapp-dev-env-block-ingestor

@@ -1,6 +1,6 @@
 FROM colony-cdapp-dev-env/base:latest
 
-ENV BLOCK_INGESTOR_HASH=caa5de336ecee1885682b198e039e3a520ce39a5
+ENV BLOCK_INGESTOR_HASH=498ff1793cc73a1fe029adda1417000b4edd066a
 
 # Declare volumes to set up metadata
 VOLUME [ "/colonyCDapp/amplify/mock-data" ]

src/components/v5/common/CompletedAction/partials/StreamingPayment/StreamingPayment.tsx

@@ -268,9 +268,6 @@ const StreamingPayment: FC<StreamingPaymentProps> = ({
           contentWrapperClassName={clsx('z-[65] sm:min-w-[11.25rem]', {
             '!left-6 right-6': isMobile,
           })}
-          dropdownPlacementProps={{
-            top: 12,
-          }}
           items={meatballOptions}
         />
       </div>

src/components/v5/shared/MeatBallMenu/MeatBallMenu.tsx

@@ -87,7 +87,7 @@ const MeatBallMenu: FC<MeatBallMenuProps> = ({
         <MenuContainer
           className={clsx(
             contentWrapperClassName,
-            'absolute !left-0 z-dropdown w-[calc(100vw-2.4rem)] min-w-[calc(100vw-2.4rem)] overflow-y-auto px-6 py-4 sm:w-fit sm:min-w-fit',
+            'absolute !right-0 z-dropdown w-[calc(100vw-2.4rem)] min-w-[calc(100vw-2.4rem)] overflow-y-auto px-6 py-4 sm:w-fit sm:min-w-fit',
           )}
           hasShadow
           rounded="s"

src/graphql/generated.ts

@@ -7,7 +7,6 @@ import {
 import moveDecimal from 'move-decimal-point';
 import { call, fork, put, takeEvery } from 'redux-saga/effects';
 
-import { mutateWithAuthRetry } from '~apollo/utils.ts';
 import { ContextModule, getContext } from '~context/index.ts';
 import {
   CreateStreamingPaymentMetadataDocument,
@@ -179,7 +178,9 @@ function* createStreamingPaymentAction({
     } = yield waitForTxResult(createStreamingPayment.channel);
 
     if (customActionTitle) {
-      yield createActionMetadataInDB(txHash, customActionTitle);
+      yield createActionMetadataInDB(txHash, {
+        customTitle: customActionTitle,
+      });
     }
 
     if (annotationMessage) {