Merge pull request #2099 from kaloudis/zeus-pay-remove-chan-references

ZEUS Pay: remove refs to chan opens
ZeusLN · Apr 2, 2024 · 5f3118e · 5f3118e
2 parents 2096dd7 + 23c5d24
commit 5f3118e
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 65 deletions.
diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json
@@ -109,10 +109,6 @@
       "path": "assets/images/SVG/Caret Up.svg",
       "sha1": "a4df241bd3151cb377b105b244f00f2a3e35cfd7"
     },
-    {
-      "path": "assets/images/SVG/Channel.svg",
-      "sha1": "4bacc36b25805d3c5726c79c135d7dbd9d2d9e37"
-    },
     {
       "path": "assets/images/SVG/Channels.svg",
       "sha1": "c9b401d8b683c9d8aadcfb41576c80a847b82a9a"

diff --git a/assets/images/SVG/Channel.svg b/assets/images/SVG/Channel.svg
diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json
@@ -109,10 +109,6 @@
       "path": "assets/images/SVG/Caret Up.svg",
       "sha1": "a4df241bd3151cb377b105b244f00f2a3e35cfd7"
     },
-    {
-      "path": "assets/images/SVG/Channel.svg",
-      "sha1": "4bacc36b25805d3c5726c79c135d7dbd9d2d9e37"
-    },
     {
       "path": "assets/images/SVG/Channels.svg",
       "sha1": "c9b401d8b683c9d8aadcfb41576c80a847b82a9a"

diff --git a/ios/zeus.xcodeproj/project.pbxproj b/ios/zeus.xcodeproj/project.pbxproj
@@ -91,7 +91,6 @@
 		7598B75F1F64426CAF420155 /* UnifiedSvg.tsx in Resources */ = {isa = PBXBuildFile; fileRef = C7FBAA85E56C4D5D92F74F11 /* UnifiedSvg.tsx */; };
 		7605A9F30F13492692B1AB4E /* Flash On.svg in Resources */ = {isa = PBXBuildFile; fileRef = DD1A9F0B9EF0475C81C53C8D /* Flash On.svg */; };
 		78FB5414F55B4D94804920B7 /* Caret Right-1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 34845404A9F04B35ADA34F80 /* Caret Right-1.svg */; };
-		79831EB47D6D4FFB90985E0F /* Channel.svg in Resources */ = {isa = PBXBuildFile; fileRef = 3AB032A5D2204613B50EB1AA /* Channel.svg */; };
 		7C9A1A0DC41A4B56BC555750 /* Node On.svg in Resources */ = {isa = PBXBuildFile; fileRef = 62458EE70D8546B7AE7F87DF /* Node On.svg */; };
 		7D5F7108F3164222AE36A242 /* Filter Off.svg in Resources */ = {isa = PBXBuildFile; fileRef = 2EC02052907E453CB15DBADA /* Filter Off.svg */; };
 		7DDC8A1B32DC415DA3A3123B /* Nostrich.svg in Resources */ = {isa = PBXBuildFile; fileRef = A7D097DE19314D50ABD77607 /* Nostrich.svg */; };
@@ -373,7 +372,6 @@
 		34845404A9F04B35ADA34F80 /* Caret Right-1.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Caret Right-1.svg"; path = "../assets/images/SVG/Caret Right-1.svg"; sourceTree = "<group>"; };
 		34F2E3639E1D4C878EA1CC22 /* Gallery.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Gallery.svg; path = ../assets/images/SVG/Gallery.svg; sourceTree = "<group>"; };
 		3814F0A0F1A84AD1AFD7C587 /* POS.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = POS.svg; path = ../assets/images/SVG/POS.svg; sourceTree = "<group>"; };
-		3AB032A5D2204613B50EB1AA /* Channel.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Channel.svg; path = ../assets/images/SVG/Channel.svg; sourceTree = "<group>"; };
 		3BD89BEBA89A4B678A29E094 /* BitcoinIcon.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = BitcoinIcon.svg; path = ../assets/images/SVG/BitcoinIcon.svg; sourceTree = "<group>"; };
 		3C37D42473A54AD981B549B4 /* NFC.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NFC.svg; path = ../assets/images/SVG/NFC.svg; sourceTree = "<group>"; };
 		3C817E9DD0504569B85A84F1 /* Edit.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Edit.svg; path = ../assets/images/SVG/Edit.svg; sourceTree = "<group>"; };
@@ -919,7 +917,6 @@
 				956E2E16008F4EA0B54DF09B /* Add.svg */,
 				3BD89BEBA89A4B678A29E094 /* BitcoinIcon.svg */,
 				B10811B91C8044358B7EBE82 /* Block.svg */,
-				3AB032A5D2204613B50EB1AA /* Channel.svg */,
 				E475512AC9944749B58EEAC1 /* Clipboard.svg */,
 				C689AF9C5EFD42E891A1FFD3 /* Cloud.svg */,
 				7ABECF711E9D4F5AB912E1C0 /* Copy.svg */,
@@ -1380,7 +1377,6 @@
 				39D956D93D0846AF909F38DA /* Add.svg in Resources */,
 				92542E72F705458EBD582CC8 /* BitcoinIcon.svg in Resources */,
 				B7B3D0A8E3C8499892224242 /* Block.svg in Resources */,
-				79831EB47D6D4FFB90985E0F /* Channel.svg in Resources */,
 				CD17533A6E834DC3982FD216 /* Clipboard.svg in Resources */,
 				40C4AE0236564EDD8B689992 /* Cloud.svg in Resources */,
 				9E2B346F72A34EA3807BC843 /* Copy.svg in Resources */,

diff --git a/locales/en.json b/locales/en.json
@@ -1015,8 +1015,6 @@
     "views.Settings.LightningAddressInfo.validAttestationDetails": "Attestation is valid. Press to see details.",
     "views.Settings.LightningAddressInfo.invalidAttestationDetails": "Invalid or conflicting attestations. Press to see details.",
     "views.Settings.LightningAddressInfo.noAttestationDetails": "No Nostr attestations found. Sender's wallet likely doesn't support it yet.",
-    "views.Settings.LightningAddressInfo.channelOpened": "Channel opened",
-    "views.Settings.LightningAddressInfo.channelOpenedDetails": "A channel was opened to you to help you redeem the payment. Enabled with 'Automatically request channels from OLYMPUS' under Lightning Address settings.",
     "views.Settings.LightningAddressInfo.learnAboutZaplocker": "Learn more about Zaplocker",
     "views.Settings.Attestations.title": "Attestations",
     "views.Settings.Attestations.noAttestationsFound": "No attestations found",

diff --git a/views/Settings/LightningAddress/LightningAddressInfo.tsx b/views/Settings/LightningAddress/LightningAddressInfo.tsx
@@ -15,7 +15,6 @@ import UrlUtils from '../../../utils/UrlUtils';
 
 import LightningAddressStore from '../../../stores/LightningAddressStore';
 
-import Channel from '../../../assets/images/SVG/Channel.svg';
 import NostrichNotLoaded from '../../../assets/images/SVG/Nostrich_not-loaded.svg';
 import NostrichValid from '../../../assets/images/SVG/Nostrich_valid.svg';
 import NostrichInvalid from '../../../assets/images/SVG/Nostrich_invalid.svg';
@@ -347,46 +346,6 @@ export default class LightningAddressInfo extends React.Component<
                                 </ListItem.Content>
                             </ListItem>
 
-                            <ListItem containerStyle={styles.listItem}>
-                                <ListItem.Content>
-                                    <ListItem.Title>
-                                        <Text
-                                            style={{
-                                                color: themeColor('text')
-                                            }}
-                                        >
-                                            {localeString(
-                                                'views.Settings.LightningAddressInfo.channelOpened'
-                                            )}
-                                        </Text>
-                                    </ListItem.Title>
-                                    <ListItem.Subtitle>
-                                        <Text
-                                            style={{
-                                                color: themeColor(
-                                                    'secondaryText'
-                                                )
-                                            }}
-                                        >
-                                            {localeString(
-                                                'views.Settings.LightningAddressInfo.channelOpenedDetails'
-                                            )}
-                                        </Text>
-                                    </ListItem.Subtitle>
-                                </ListItem.Content>
-                                <ListItem.Content right>
-                                    <Row>
-                                        <View style={styles.icon}>
-                                            <Channel
-                                                fill={themeColor('text')}
-                                                width={42}
-                                                height={42}
-                                            />
-                                        </View>
-                                    </Row>
-                                </ListItem.Content>
-                            </ListItem>
-
                             <View style={{ marginTop: 20 }}>
                                 <Button
                                     title={localeString(

diff --git a/views/Settings/LightningAddress/LightningAddressPayment.tsx b/views/Settings/LightningAddress/LightningAddressPayment.tsx
@@ -13,7 +13,6 @@ import stores from '../../../stores/Stores';
 import { localeString } from '../../../utils/LocaleUtils';
 import { themeColor } from '../../../utils/ThemeUtils';
 
-import Channel from '../../../assets/images/SVG/Channel.svg';
 import Receive from '../../../assets/images/SVG/Receive.svg';
 
 export default function LightningAddressPayment(props) {
@@ -72,14 +71,6 @@ export default function LightningAddressPayment(props) {
             </ListItem.Content>
             <ListItem.Content right>
                 <Row>
-                    {item.opened_channel && (
-                        <Channel
-                            fill={themeColor('text')}
-                            width={42}
-                            height={42}
-                            style={{ marginRight: 10 }}
-                        />
-                    )}
                     <AttestationButton
                         hash={item.hash}
                         amount_msat={item.amount_msat}