6f1e06f · bridge · git.iko.soy

git.iko.soy/bridge

Fixed point logic and dropdown

commit6f1e06fc1ada654c98a5429cdef8977eb2e93f0b authorWill Galebach <willbach@gmail.com> dateThu 2 Dec 2021, 17:11 (5 years ago) parentb6873da

4 files changed+10−22

compare with master

unifiedsplit

src/components/L2/Dropdowns/AccountsDropdown.tsx+2−8 src/lib/useRoller.ts+4 src/store/rollerStore.ts+1−1 src/views/Points.js+3−13

src/components/L2/Dropdowns/AccountsDropdown.tsx+2−8

@@ -123,15 +123,9 @@ const AccountsDropdown = ({ showMigrate = false }: AccountsDropdownProps) => {

123123 <Icon icon="Bitcoin" />

124124 </Row>

125125 )}

126− {point.isParent && point.canSpawn && (

126+ {point.isParent && point.canSpawn && point.isL1 && (

127127 <Row className="entry" onClick={goSpawn}>

128− <Box>

129− {point.isStar

130− ? point.isL2Spawn

131− ? 'Create Invites'

132− : 'Spawn Planets'

133− : 'Spawn Stars'}

134− </Box>

128+ <Box>Spawn{point.isStar ? ' Planets' : ' Stars'}</Box>

135129 <Icon icon="Plus" />

136130 </Row>

137131 )}

src/lib/useRoller.ts+4

@@ -244,6 +244,10 @@ export default function useRoller() {

244244 ? 'newPoint'

245245 : updatedPoint.getChangedField(points[point], field);

246246

247+ if (isDevelopment) {

248+ console.log(`CHECKING FOR ${changedField} UPDATES:`, updatedPoint);

249+ }

250+

247251 if (!updatedPoint.isPlaceholder && changedField) {

248252 updatePoint(updatedPoint);

249253 clearInterval(interval);

src/store/rollerStore.ts+1−1

@@ -8,7 +8,7 @@ import { toL1Details } from 'lib/utils/point';

99const getPointsAndList = (points: Points, point: Point) => ({

1010 points,

11− pointList: Object.values(points),

11+ pointList: Object.values(points).sort((a, b) => a.value - b.value),

1212 point: point.isDefault ? point : points[point.value],

1313});

1414

src/views/Points.js+3−13

@@ -234,21 +234,11 @@ export default function Points() {

234234 const loading = Nothing.hasInstance(controlledPoints);

235235

236236 const ownedPoints = maybeGetResult(controlledPoints, 'ownedPoints', []);

237− const managingPoints = maybeGetResult(controlledPoints, 'managingPoints', []);

238− const votingPoints = maybeGetResult(controlledPoints, 'votingPoints', []);

239− const spawningPoints = maybeGetResult(controlledPoints, 'spawningPoints', []);

240237 const lockedPoints = maybeLockedPoints.getOrElse([]);

241238

242− const allPoints = [

243− ...ownedPoints.filter(

244− p => !outgoingPoints.find(({ value }) => value === p)

245− ),

246− ...managingPoints,

247− ...votingPoints,

248− ...spawningPoints,

249− ]

250− .sort((a, b) => Number(a) - Number(b))

251− .filter(onlyUnique);

239+ const allPoints = pointList

240+ .filter(({ isTransferProxySet }) => !isTransferProxySet)

241+ .map(({ value }) => value);

252242

253243 const displayEmptyState =

254244 !loading && incomingPoints.length === 0 && allPoints.length === 0;