Hide fee from settings payouts modals (#4073)

jbx-protocol · Sep 18, 2023 · b309c81 · b309c81 · vercel · Sep 18, 2023
1 parent 07bdf8e
commit b309c81
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/...ect/V2V3ProjectSettings/pages/NewEditCyclePage/PayoutsSection/PayoutsTable/HeaderRows.tsx b/...ect/V2V3ProjectSettings/pages/NewEditCyclePage/PayoutsSection/PayoutsTable/HeaderRows.tsx
@@ -74,6 +74,7 @@ export function HeaderRows() {
         onOk={handleAddRecipientModalOk}
         onCancel={() => setAddRecipientModalOpen(false)}
         hideProjectOwnerOption
+        hideFee
       />
     </>
   )

diff --git a/...V2V3ProjectSettings/pages/NewEditCyclePage/PayoutsSection/PayoutsTable/PayoutSplitRow.tsx b/...V2V3ProjectSettings/pages/NewEditCyclePage/PayoutsSection/PayoutsTable/PayoutSplitRow.tsx
@@ -133,6 +133,7 @@ export function PayoutSplitRow({
         onOk={handleEditModalOk}
         onCancel={() => setEditModalOpen(false)}
         hideProjectOwnerOption
+        hideFee
       />
     </>
   )

diff --git a/...ject/V2V3ProjectSettings/pages/NewEditCyclePage/PayoutsSection/PayoutsTable/TotalRows.tsx b/...ject/V2V3ProjectSettings/pages/NewEditCyclePage/PayoutsSection/PayoutsTable/TotalRows.tsx
@@ -57,7 +57,7 @@ export function TotalRows() {
           <Cell>
             <TooltipLabel
               tip={t`The unallocated portion of your total will go to the wallet that owns the project by default.`}
-              label={<Trans>Remaining balance (Project Owner)</Trans>}
+              label={<Trans>Remaining (to project owner)</Trans>}
             />
           </Cell>
           <Cell>

diff --git a/src/components/v2v3/shared/Allocation/AddEditAllocationModal.tsx b/src/components/v2v3/shared/Allocation/AddEditAllocationModal.tsx
@@ -55,6 +55,7 @@ export const AddEditAllocationModal = ({
   onOk,
   onCancel,
   hideProjectOwnerOption,
+  hideFee,
 }: {
   className?: string
   allocationName: string
@@ -64,6 +65,7 @@ export const AddEditAllocationModal = ({
   onOk: (split: AddEditAllocationModalEntity) => void
   onCancel: VoidFunction
   hideProjectOwnerOption?: boolean
+  hideFee?: boolean
 }) => {
   const { primaryETHTerminalFee } = useContext(V2V3ProjectContext)
 
@@ -81,7 +83,8 @@ export const AddEditAllocationModal = ({
 
   const amount = Form.useWatch('amount', form)
 
-  const showFee = amountType === 'amount' && recipient === 'walletAddress'
+  const showFee =
+    amountType === 'amount' && recipient === 'walletAddress' && !hideFee
 
   const isValidJuiceboxProject = useMemo(
     () =>

diff --git a/src/locales/messages.pot b/src/locales/messages.pot
@@ -2522,6 +2522,9 @@ msgstr ""
 msgid "Deploy an address which forwards ETH to your project. This makes it easier to pay your project with third-party tools."
 msgstr ""
 
+msgid "Remaining (to project owner)"
+msgstr ""
+
 msgid "Ethereum wallet address"
 msgstr ""
 
@@ -4505,9 +4508,6 @@ msgstr ""
 msgid "There's nothing here"
 msgstr ""
 
-msgid "Remaining balance (Project Owner)"
-msgstr ""
-
 msgid "Locked cycles"
 msgstr ""
-Original file line number
+Diff line change
@@ Expand Up / @@ -74,6 +74,7 @@ export function HeaderRows() { @@
             onOk={handleAddRecipientModalOk}
             onCancel={() => setAddRecipientModalOpen(false)}
             hideProjectOwnerOption
+            hideFee
           />
         </>
       )
@@ Expand Down @@