swap: fix incorrect multi Loop In warning

Author: jamaljsr

app/src/components/loop/LoopActions.tsx

@@ -51,15 +51,24 @@ const LoopActions: React.FC = () => {
   const {
     setDirection,
     inferredDirection,
-    loopOutAllowed,
-    loopInAllowed,
+    isLoopOutMinimumMet,
+    isLoopInMinimumMet,
+    hasValidLoopInPeers,
   } = buildSwapStore;
   const handleLoopOut = useCallback(() => setDirection(SwapDirection.OUT), [
     setDirection,
   ]);
   const handleLoopIn = useCallback(() => setDirection(SwapDirection.IN), [setDirection]);
   const selectedCount = buildSwapStore.selectedChanIds.length;
 
+  let note =
+    !isLoopOutMinimumMet || !isLoopInMinimumMet
+      ? l('loopMinimumNote', { min: formatSats(buildSwapStore.termsForDirection.min) })
+      : '';
+  if (!hasValidLoopInPeers) {
+    note = l('loopInNote');
+  }
+
   const { Wrapper, Actions, ActionBar, CloseIcon, Selected, Note } = Styled;
   return (
     <Wrapper>
@@ -69,31 +78,27 @@ const LoopActions: React.FC = () => {
             <CloseIcon onClick={buildSwapStore.cancel} />
             <Selected count={selectedCount} />
             <Button
-              primary={loopOutAllowed && inferredDirection === SwapDirection.OUT}
+              primary={isLoopOutMinimumMet && inferredDirection === SwapDirection.OUT}
               borderless
               onClick={handleLoopOut}
-              disabled={!loopOutAllowed}
+              disabled={!isLoopOutMinimumMet}
             >
               {l('common.loopOut')}
             </Button>
             <Button
-              primary={loopInAllowed && inferredDirection === SwapDirection.IN}
+              primary={
+                hasValidLoopInPeers &&
+                isLoopInMinimumMet &&
+                inferredDirection === SwapDirection.IN
+              }
               borderless
               onClick={handleLoopIn}
-              disabled={!loopInAllowed}
+              disabled={!hasValidLoopInPeers || !isLoopInMinimumMet}
             >
               {l('common.loopIn')}
             </Button>
           </ActionBar>
-          {!loopOutAllowed && !loopInAllowed ? (
-            <Note>
-              {l('loopMinimumNote', {
-                min: formatSats(buildSwapStore.termsForDirection.min),
-              })}
-            </Note>
-          ) : !loopInAllowed ? (
-            <Note>{l('loopInNote')}</Note>
-          ) : null}
+          {note && <Note>{note}</Note>}
         </Actions>
       ) : (
         <Button onClick={buildSwapStore.startSwap}>

app/src/store/stores/buildSwapStore.ts

@@ -148,12 +148,24 @@ class BuildSwapStore {
   }
 
   /**
-   * determines if Loop In is allowed. the balance of selected (or all)
-   * channels must be greater than the minimum swap allowed. if multiple
-   * channels are selected, they must all be with the same peer
+   * determines if the selected channels all use the same peer. also
+   * return true if no channels are selected
    */
   @computed
-  get loopInAllowed() {
+  get hasValidLoopInPeers() {
+    if (this.selectedChanIds.length > 0) {
+      return this.loopInLastHop !== undefined;
+    }
+
+    return true;
+  }
+
+  /**
+   * determines if the balance of selected (or all) channels are
+   * greater than the minimum swap allowed
+   */
+  @computed
+  get isLoopInMinimumMet() {
     const { min, max } = this.getTermsForDirection(SwapDirection.IN);
     if (!max.gt(min)) return false;
 
@@ -169,7 +181,7 @@ class BuildSwapStore {
    * channels must be greater than the minimum swap allowed
    */
   @computed
-  get loopOutAllowed() {
+  get isLoopOutMinimumMet() {
     const { min, max } = this.getTermsForDirection(SwapDirection.OUT);
     if (!max.gt(min)) return false;