fix: merge votes button not working (#2466)

* fix: removed non-existing wallet.rs function * chore: remove unused function
iotaledger · Mar 4, 2022 · 7f7ad99 · 7f7ad99
1 parent ace7916
commit 7f7ad99
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 76 deletions.
diff --git a/packages/backend/bindings/node/index.ts b/packages/backend/bindings/node/index.ts
@@ -64,7 +64,6 @@ import {
     getParticipationEvents as _getParticipationEvents,
     getParticipationOverview as _getParticipationOverview,
     participate as _participate,
-    participateWithRemainingFunds as _participateWithRemainingFunds,
     stopParticipating as _stopParticipating,
 } from '../../../shared/lib/participation/bridge'
 import { Participation } from '../../../shared/lib/participation/types'
@@ -369,13 +368,6 @@ export const api = {
     stopParticipating: function (accountId: string, eventIds: string[]): (__ids: CommunicationIds) => Promise<string> {
         return (__ids: CommunicationIds) => _stopParticipating(sendMessage, __ids, accountId, eventIds)
     },
-    participateWithRemainingFunds: function (
-        accountId: string,
-        participations: Participation[]
-    ): (__ids: CommunicationIds) => Promise<string> {
-        return (__ids: CommunicationIds) =>
-            _participateWithRemainingFunds(sendMessage, __ids, accountId, participations)
-    },
 
     // Event emitters
     onError: function (): (__ids: CommunicationIds) => Promise<string> {

diff --git a/packages/shared/components/popups/GovernanceCastVote.svelte b/packages/shared/components/popups/GovernanceCastVote.svelte
@@ -5,7 +5,7 @@
     import { closePopup } from 'shared/lib/popup'
     import { isSoftwareProfile } from 'shared/lib/profile'
     import { selectedAccount, api, isSyncing } from 'shared/lib/wallet'
-    import { participate, participateWithRemainingFunds, stopParticipating } from 'shared/lib/participation/api'
+    import { participate, stopParticipating } from 'shared/lib/participation/api'
     import { showAppNotification } from 'shared/lib/notifications'
     import { openPopup } from 'shared/lib/popup'
     import {
@@ -82,14 +82,8 @@
     const vote = async (): Promise<void> => {
         switch (votingAction) {
             case VotingAction.Cast:
-                await participate(
-                    $selectedAccount?.id,
-                    [{ eventId, answers: [nextVote?.value] }],
-                    ParticipationAction.Vote
-                )
-                break
             case VotingAction.Merge:
-                await participateWithRemainingFunds(
+                await participate(
                     $selectedAccount?.id,
                     [{ eventId, answers: [nextVote?.value] }],
                     ParticipationAction.Vote

diff --git a/packages/shared/lib/participation/api.ts b/packages/shared/lib/participation/api.ts
@@ -106,26 +106,3 @@ export function stopParticipating(
         })
     })
 }
-
-export function participateWithRemainingFunds(
-    accountId: string,
-    participations: Participation[],
-    action: ParticipationAction
-): Promise<string[]> {
-    return new Promise((resolve, reject) => {
-        api.participateWithRemainingFunds(accountId, participations, {
-            onSuccess(response: Event<ParticipateResponsePayload>) {
-                response.payload.forEach((message) => saveNewMessage(accountId, message))
-
-                addNewPendingParticipation(response.payload, accountId, action)
-
-                resolve(response.payload.map((message) => message.id))
-            },
-            onError(error) {
-                console.error(error)
-
-                reject(error)
-            },
-        })
-    })
-}
diff --git a/packages/shared/lib/participation/bridge.ts b/packages/shared/lib/participation/bridge.ts
@@ -96,32 +96,3 @@ export function stopParticipating(
         },
     })
 }
-
-/**
- * Participate in event(s) with additional funds
- *
- * @method participateWithRemainingFunds
- *
- * @param {Bridge} bridge
- * @param {CommunicationIds} __ids
- * @param {string} accountId
- * @param {Participation[]} participations
- *
- * @returns {Promise<string>}
- */
-export function participateWithRemainingFunds(
-    bridge: Bridge,
-    __ids: CommunicationIds,
-    accountId: string,
-    participations: Participation[]
-): Promise<string> {
-    return bridge({
-        actorId: __ids.actorId,
-        id: __ids.messageId,
-        cmd: 'ParticipateWithRemainingFunds',
-        payload: {
-            account_identifier: accountId,
-            participations,
-        },
-    })
-}
diff --git a/packages/shared/lib/typings/walletApi.ts b/packages/shared/lib/typings/walletApi.ts
@@ -291,12 +291,4 @@ export interface IWalletApi {
             onError: (err: ErrorEventPayload) => void
         }
     )
-    participateWithRemainingFunds(
-        accountId: string,
-        participations: Participation[],
-        callbacks: {
-            onSuccess: (response: Event<ParticipateResponsePayload>) => void
-            onError: (err: ErrorEventPayload) => void
-        }
-    )
 }