Improve logic around funding domains with tokens

Author: area

contracts/colony/ColonyFunding.sol

@@ -131,25 +131,26 @@ contract ColonyFunding is
 
     fundingPots[0].balance[_token] += feeToPay;
 
-    if (tokenEarnsReputationOnPayout(_token)) {
-      // If token earns reputation, we only allow up to the approved amount to be received
-      uint256 approvedAmount = domainReputationTokenApprovals[_domainId][_token];
-      if (approvedAmount < remainder) {
-        fundingPots[fundingPotId].balance[_token] += approvedAmount;
-        Domain storage rootDomain = domains[1];
-        // And the rest goes to the root pot
-        fundingPots[rootDomain.fundingPotId].balance[_token] += remainder - approvedAmount;
-        domainReputationTokenApprovals[_domainId][_token] = 0;
-        emit DomainFundsClaimed(msgSender(), _token, _domainId, feeToPay, approvedAmount);
-        emit ColonyFundsClaimed(msgSender(), _token, 0, remainder - approvedAmount);
-      } else {
-        fundingPots[fundingPotId].balance[_token] += remainder;
+    uint256 approvedAmount = domainReputationTokenApprovals[_domainId][_token];
+    if (!tokenEarnsReputationOnPayout(_token) || approvedAmount >= remainder) {
+      // Either the token doesn't earn reputation or there is enough approval
+      // Either way, the domain gets all the funds
+      fundingPots[fundingPotId].balance[_token] += remainder;
+      if (tokenEarnsReputationOnPayout(_token)) {
+        // If it does earn reputation, deduct the approved amount
         domainReputationTokenApprovals[_domainId][_token] -= remainder;
-        emit DomainFundsClaimed(msgSender(), _token, _domainId, feeToPay, remainder);
       }
-    } else {
-      fundingPots[fundingPotId].balance[_token] += remainder;
       emit DomainFundsClaimed(msgSender(), _token, _domainId, feeToPay, remainder);
+    } else {
+      // The token earns reputation and there is not enough approvalable
+      // The domain gets what was approved
+      fundingPots[fundingPotId].balance[_token] += approvedAmount;
+      // And the rest goes to the root pot
+      Domain storage rootDomain = domains[1];
+      fundingPots[rootDomain.fundingPotId].balance[_token] += remainder - approvedAmount;
+      domainReputationTokenApprovals[_domainId][_token] = 0;
+      emit DomainFundsClaimed(msgSender(), _token, _domainId, feeToPay, approvedAmount);
+      emit ColonyFundsClaimed(msgSender(), _token, 0, remainder - approvedAmount);
     }
 
     // Claim funds