mirror of https://github.com/vector-im/riot-web
				
				
				
			other PR iteration based on feedback
							parent
							
								
									2fb6e73794
								
							
						
					
					
						commit
						5c44ff8f8a
					
				| 
						 | 
				
			
			@ -1093,7 +1093,6 @@ export const useDevices = (userId) => {
 | 
			
		|||
                // Promise.resolve to handle transition from static result to promise; can be removed in future
 | 
			
		||||
                Promise.resolve(cli.getStoredDevicesForUser(userId)).then((devices) => {
 | 
			
		||||
                    if (cancel) return;
 | 
			
		||||
                    console.log("setDevices 2", devices);
 | 
			
		||||
                    setDevices(devices);
 | 
			
		||||
                });
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -91,7 +91,7 @@ export default class VerificationShowSas extends React.Component {
 | 
			
		|||
            const text = _t("Waiting for %(displayName)s to verify…", {displayName});
 | 
			
		||||
            confirm = <PendingActionSpinner text={text} />;
 | 
			
		||||
        } else {
 | 
			
		||||
            // FIXME: stop using DialogButtons here once it this component is only used in the right panel verification
 | 
			
		||||
            // FIXME: stop using DialogButtons here once this component is only used in the right panel verification
 | 
			
		||||
            confirm = <DialogButtons
 | 
			
		||||
                primaryButton={_t("They match")}
 | 
			
		||||
                onPrimaryButtonClick={this.onMatchClick}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue